解决派车时派车来源id为空问题

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

@@ -461,17 +461,20 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             tmsorderbillsplans.setUpdateTime(new Date());
             tmsorderbillsplans.setUpdateBy(loginUser.getUsername());
             ftmsorderbillsplansMapper.updateftmsorderbillsplans(tmsorderbillsplans);
-            JSONArray planJson = JSONArray.parseArray(cars);
-            List<Ftmsorderbillscars> tmsorderbillscarsList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillscars.class);
-            for (Ftmsorderbillscars s : tmsorderbillscarsList) {
-                if (StringUtils.isNull(s.getId())) {
-                    s.setBillStatus(2L);
-                }
-                s.setCreateTime(new Date());
-                s.setCreateBy(loginUser.getUsername());
-                if (ftmsorderbillscarsMapper.insertftmsorderbillscars(s) <= 0) {
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("更新车辆安排失败，若多次失败请联系管理员");
+            if (StringUtils.isNotEmpty(cars) && !"[]".equals(cars)) {
+                JSONArray planJson = JSONArray.parseArray(cars);
+                List<Ftmsorderbillscars> tmsorderbillscarsList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillscars.class);
+                for (Ftmsorderbillscars s : tmsorderbillscarsList) {
+                    if (StringUtils.isNull(s.getId())) {
+                        s.setBillStatus(2L);
+                    }
+                    s.setOrgId(pId);
+                    s.setCreateTime(new Date());
+                    s.setCreateBy(loginUser.getUsername());
+                    if (ftmsorderbillscarsMapper.insertftmsorderbillscars(s) <= 0) {
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return AjaxResult.error("更新车辆安排失败，若多次失败请联系管理员");
+                    }
                 }
             }
         } else {
@@ -680,8 +683,8 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             return AjaxResult.error("派车货量超出调度安排数量，请确认");
         }
         Ftmsorderbills tmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
-        ftmsorderbillscars.setOrgId(tmsorderbills.getId());
         ftmsorderbillscars.setMblno(tmsorderbills.getMblno());
+        ftmsorderbillscars.setOrgId(ftmsorderbillsplans.getOrgId());
         ftmsorderbillsplans.setCarQty(carQty);
         if (ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();