解决禅道问题

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -502,9 +502,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             billsStatus = 80L;
             JSONArray planJson = JSONArray.parseArray(cars);
             List<Ftmsorderbillscars> tmsorderbillscarsList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillscars.class);
-            int line = 0;
             for (Ftmsorderbillscars s : tmsorderbillscarsList) {
-                line++;
                 s.setOrgId(pId);
                 s.setBillStatus(6L);
                 s.setCreateTime(new Date());
@@ -862,6 +860,22 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() - tmsorderbillscars.getCntrQty() + ftmsorderbillscars.getCntrQty());
         ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
+        if (StringUtils.isNull(ftmsorderbillscars.getOrderNo())) {
+            // 流水号 是否有回收
+            BillnoDel billnoDel = new BillnoDel();
+            billnoDel.setBillType("SJLSH");
+            BillnoDel billnoDels = billnoDelMapper.selectBillnoDelBillNo(billnoDel);
+            // 如果有数据在删除列表
+            if (StringUtils.isNotNull(billnoDels)) {
+                billnoDelMapper.deleteBillnoDelById(billnoDels.getId());
+                ftmsorderbillscars.setOrderNo(billnoDels.getBillNo());
+            } else {
+                // 生成流水号
+                Date time = new Date();
+                String billNo = billnoSerialServiceImpl.getSerialNumber("SJLSH", time);
+                ftmsorderbillscars.setOrderNo(billNo);
+            }
+        }
         ftmsorderbillscars.setBillStatus(6L);
         ftmsorderbillscars.setPlanDate(new Date());
         ftmsorderbillscars.setUpdateTime(new Date());

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsplansServiceImpl.java

@@ -33,6 +33,13 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
  */
 @Service
 public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansService {
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private WechatService wechatService;
+
     @Autowired
     private FtmsorderbillsMapper ftmsorderbillsMapper;
 
@@ -60,12 +67,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     @Autowired
     private FtmsorderbillsattachsMapper ftmsorderbillsattachsMapper;
 
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
-    @Autowired
-    private WechatService wechatService;
-
 
     @Override
     public void testt(String phone) {
@@ -367,7 +368,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         }
         // 计划下达数据
         Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
-        long cntrQty = tmsorderbillsplans.getCntrQty() - ftmsorderbillsplans.getCntrQty();
+        long cntrQty = ftmsorderbillsplans.getCntrQty() - tmsorderbillsplans.getCntrQty();
         bills.setQtyDisPatch(bills.getQtyDisPatch() + cntrQty);
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -382,8 +383,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         }
         Map<String, Object> map = new HashMap<>();
         Ftmsorderbillscntrs scntrs = new Ftmsorderbillscntrs();
-        scntrs.setId(tmsorderbillsplans.getPId());
-        scntrs.setBillStatus(6L);
+        scntrs.setOrgId(tmsorderbillsplans.getOrgId());
         map.put("plan", tmsorderbillsplans);
         map.put("cntrs", ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(scntrs));
         return AjaxResult.success(map);
@@ -602,11 +602,12 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     @Transactional
     public AjaxResult insertftmsorderbills(String tmsorder, String attachs, String fees, String plans, LoginUser loginUser) {
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
-        tmsorderbills.setBillStatus(60L);
-        tmsorderbills.setUpdateTime(new Date());
-        tmsorderbills.setUpdateBy(loginUser.getUsername());
-        ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
-        long pId = tmsorderbills.getId();
+        Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbills.getId());
+        ftmsorderbills.setBillStatus(60L);
+        ftmsorderbills.setUpdateTime(new Date());
+        ftmsorderbills.setUpdateBy(loginUser.getUsername());
+        ftmsorderbillsMapper.updateftmsorderbills(ftmsorderbills);
+        long pId = ftmsorderbills.getId();
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
         ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(1010L);

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -413,7 +413,7 @@
             c.order_no orderNo,
             c.mblno,
             c.carreg_no carregNo,
-            driver.NAME,
+            driver.name driverName,
             c.driver_tel driverTel,
             CASE
             c.order_status