解决派车司机未生成编号，以及变更撤销判断问题

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetCarManageServiceImpl.java

@@ -115,6 +115,7 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
+        fleetCarManage.setBillStatus(6L);
         if(null!=fleetCarManage.getId() && !fleetCarManage.getId().equals("")){
             fleetCarManage.setUpdateBy(SecurityUtils.getUsername());
             fleetCarManage.setUpdateTime(new Date());
@@ -139,6 +140,7 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
+        fleetCarManage1.setBillStatus(6L);
         if(null!=fleetCarManage1.getId() && !fleetCarManage1.getId().equals("")){
             fPid = fleetCarManage1.getId();
             fleetCarManage1.setUpdateBy(SecurityUtils.getUsername());

ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -92,6 +92,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("请填写必输项");
         }
+        fleetDriverMsg.setBillStatus(6L);
         if (null != fleetDriverMsg.getId()) {
             updateDriverPhone(fleetDriverMsg);
             fleetDriverMsg.setUpdateTime(new Date());

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

@@ -359,7 +359,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         }
         if (!billStatus && tmsorderbills.getBillStatus() == 30L) {
             return AjaxResult.error("调度单据已被撤销无法变更");
-        } else if (billStatus && tmsorderbills.getBillStatus() < 60L) {
+        } else if (!billStatus && tmsorderbills.getBillStatus() < 60L) {
             return AjaxResult.error("调度单据未提交无法变更");
         }
         return AjaxResult.success();

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

@@ -21,6 +21,9 @@ import com.ruoyi.framework.web.service.WechatService;
 import com.ruoyi.orderPlan.domain.*;
 import com.ruoyi.orderPlan.mapper.*;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.warehouseBusiness.domain.BillnoDel;
+import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
+import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
 import com.ruoyi.statusTracking.domain.Ftmsorderbillsfees;
@@ -54,9 +57,15 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     private SysUserMapper sysUserMapper;
 
     @Autowired
+    private BillnoDelMapper billnoDelMapper;
+
+    @Autowired
     private FtmsorderbillsMapper ftmsorderbillsMapper;
 
     @Autowired
+    private BillnoSerialServiceImpl billnoSerialServiceImpl;
+
+    @Autowired
     private FtmsorderbillsServiceImpl ftmsorderbillsService;
 
     @Autowired
@@ -457,10 +466,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachs(ftmsorderbillsattachs);
         if ("save".equals(billType)) {
             // 保存
-            tmsorderbillsplans.setBillStatus(20L);
-            tmsorderbillsplans.setUpdateTime(new Date());
-            tmsorderbillsplans.setUpdateBy(loginUser.getUsername());
-            ftmsorderbillsplansMapper.updateftmsorderbillsplans(tmsorderbillsplans);
             if (StringUtils.isNotEmpty(cars) && !"[]".equals(cars)) {
                 JSONArray planJson = JSONArray.parseArray(cars);
                 List<Ftmsorderbillscars> tmsorderbillscarsList = JSONObject.parseArray(planJson.toJSONString(), Ftmsorderbillscars.class);
@@ -477,6 +482,16 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                     }
                 }
             }
+            Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
+            ftmsorderbillscars.setBillStatus(6L);
+            if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars) > 0) {
+                tmsorderbillsplans.setBillStatus(20L);
+            } else {
+                tmsorderbillsplans.setBillStatus(6L);
+            }
+            tmsorderbillsplans.setUpdateTime(new Date());
+            tmsorderbillsplans.setUpdateBy(loginUser.getUsername());
+            ftmsorderbillsplansMapper.updateftmsorderbillsplans(tmsorderbillsplans);
         } else {
             // 提交
             tmsorderbillsplans.setBillStatus(60L);
@@ -584,9 +599,8 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             String ajaxCode = result.get("code").toString();
             if ("500".equals(ajaxCode)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return result;
             }
-            return AjaxResult.success();
+            return result;
         }
         // 变更提交
         if ("change".equals(status)) {
@@ -594,8 +608,8 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             String ajaxCode = result.get("code").toString();
             if ("500".equals(ajaxCode)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return result;
             }
+            return result;
         }
         // 撤销
         if ("revoke".equals(status)) {
@@ -603,7 +617,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             String ajaxCode = result.get("code").toString();
             if ("500".equals(ajaxCode)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return result;
             }
             return result;
         }
@@ -613,7 +626,6 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             String ajaxCode = result.get("code").toString();
             if ("500".equals(ajaxCode)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return result;
             }
             return result;
         }
@@ -677,12 +689,27 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Transactional
     public AjaxResult vehicleChangeAdd(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
+        Map<String, Object> map = new HashMap<>();
         Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId());
         long carQty = ftmsorderbillsplans.getCarQty() + ftmsorderbillscars.getCntrQty();
         if (ftmsorderbillsplans.getCntrQty() < carQty) {
             return AjaxResult.error("派车货量超出调度安排数量，请确认");
         }
         Ftmsorderbills tmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
+        // 流水号 是否有回收
+        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.setMblno(tmsorderbills.getMblno());
         ftmsorderbillscars.setOrgId(ftmsorderbillsplans.getOrgId());
         ftmsorderbillsplans.setCarQty(carQty);
@@ -690,6 +717,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
+        map.put("plan", ftmsorderbillsplans);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
         Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
         // 应收运价
@@ -712,6 +740,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新车辆安排数据失败，若多次失败请联系管理员");
         }
+        map.put("cars", ftmsorderbillscars);
         SysUser sysUser = sysUserMapper.selectUserByTel(ftmsorderbillscars.getDriverTel());
         if (StringUtils.isNotNull(sysUser)) {
             String openId = sysUser.getOpenId();
@@ -722,7 +751,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TCorps corps = tCorpsMapper.selectTCorpsById(tmsorderbills.getCorpId());
             wechatService.newsPush(openId, nickName, mblno, amtDr + "", corps.getfName(), loadDate, "其他消息暂定", "备注暂定");
         }
-        return AjaxResult.success(ftmsorderbillscars);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -732,6 +761,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Transactional
     public AjaxResult vehicleChangeRevoke(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
+        Map<String, Object> map = new HashMap<>();
         // 验证司机是否产生费用，若产生的费用已经结算则拦截
         List<Ftmsorderbillsfees> ftmsorderbillsfeesList = ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesByPId(ftmsorderbillscars.getId());
         if (ftmsorderbillsfeesList.size() != 0) {
@@ -744,17 +774,25 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         if (ftmsorderbillscars.getOrderStatus() > 30) {
             return AjaxResult.error("该安排车辆已经装卸货，无法撤回");
         }
+        ftmsorderbillscars.setBillStatus(3L);
+        ftmsorderbillscars.setUpdateTime(new Date());
+        ftmsorderbillscars.setUpdateBy(loginUser.getUsername());
+        ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars);
         // 更新业务调度已调度数量
         Ftmsorderbillsplans tmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId());
         tmsorderbillsplans.setCarQty(tmsorderbillsplans.getCarQty() - ftmsorderbillscars.getCntrQty());
+        Ftmsorderbillscars cars = new Ftmsorderbillscars();
+        cars.setBillStatus(6L);
+        if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(cars) <= 0) {
+            tmsorderbillsplans.setBillStatus(6L);
+        }
         if (ftmsorderbillsplansMapper.updateftmsorderbillsplans(tmsorderbillsplans) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度安排失败，若多次出现请联系管理员");
         }
-        ftmsorderbillscars.setBillStatus(3L);
-        ftmsorderbillscars.setUpdateTime(new Date());
-        ftmsorderbillscars.setUpdateBy(loginUser.getUsername());
-        ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars);
-        return AjaxResult.success();
+        map.put("plan", tmsorderbillsplans);
+        map.put("cars", ftmsorderbillscars);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -764,11 +802,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Transactional
     public AjaxResult vehicleChangeRemove(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
+        Map<String, Object> map = new HashMap<>();
         // 判断是否卸车
         Ftmsorderbillscars tmsorderbillscars = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(ftmsorderbillscars.getId());
-        if (tmsorderbillscars.getBillStatus() == 3) {
-            return AjaxResult.error("该安排车辆状态已在变更中，无法删除");
-        }
         if (tmsorderbillscars.getBillStatus() == 6) {
             return AjaxResult.error("该安排车辆状态已提交，无法删除");
         }
@@ -782,7 +818,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("删除车辆信息失败，若多次失败请联系管理员");
         }
-        return AjaxResult.success();
+        map.put("plan", ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId()));
+        map.put("cars", ftmsorderbillscars);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -792,6 +830,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Transactional
     public AjaxResult vehicleChangeSubmission(Ftmsorderbillscars ftmsorderbillscars, LoginUser loginUser) {
+        Map<String, Object> map = new HashMap<>();
         if (StringUtils.isNull(ftmsorderbillscars.getCarcorPid())) {
             return AjaxResult.error("未找到车号信息，请确认");
         }
@@ -808,16 +847,20 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
+        Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
         ftmsorderbillscars.setBillStatus(6L);
         ftmsorderbillscars.setPlanDate(new Date());
         ftmsorderbillscars.setUpdateTime(new Date());
+        ftmsorderbillscars.setOrgId(ftmsorderbills.getId());
+        ftmsorderbillscars.setMblno(ftmsorderbills.getMblno());
         ftmsorderbillscars.setUpdateBy(loginUser.getUsername());
-        ftmsorderbillscars.setOrgId(ftmsorderbillsplans.getOrgId());
         if (ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新车辆数据失败，若多次失败请联系管理员");
         }
-        return AjaxResult.success();
+        map.put("plan", ftmsorderbillsplans);
+        map.put("cars", ftmsorderbillscars);
+        return AjaxResult.success(map);
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.orderPlan.service.impl;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.alibaba.fastjson.JSON;
@@ -267,17 +268,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
                 return AjaxResult.error("调度安排货量不得低于已派车数量");
             }
         }
-        // 箱型箱量数据
-        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
-        long qty = ftmsorderbillscntrs.getCntrPlanQty() + tmsorderbillsplans.getCntrQty();
-        if (ftmsorderbillscntrs.getCntrBlcQty() < tmsorderbillsplans.getCntrQty()) {
-            return AjaxResult.error("调度数量超出计划箱量不可提交");
-        }
-        ftmsorderbillscntrs.setCntrPlanQty(qty);
-        if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
         tmsorderbillsplans.setOrgId(pId);
         tmsorderbillsplans.setBillStatus(6L);
         tmsorderbillsplans.setCreateTime(new Date());
@@ -292,6 +282,25 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
+        // 箱型箱量数据
+        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
+        long qty = ftmsorderbillscntrs.getCntrPlanQty() + tmsorderbillsplans.getCntrQty();
+        if (ftmsorderbillscntrs.getCntrBlcQty() < tmsorderbillsplans.getCntrQty()) {
+            return AjaxResult.error("调度数量超出计划箱量不可提交");
+        }
+        ftmsorderbillscntrs.setCntrPlanQty(qty);
+        if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
+        }
+        // 计划下达数据
+        Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
+        BigDecimal qtyDisPatch = bills.getQtyDisPatch().add(new BigDecimal(tmsorderbillsplans.getCntrQty()));
+        bills.setQtyDisPatch(qtyDisPatch);
+        if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
+        }
         return AjaxResult.success(ftmsorderbillsplansMapper.selectftmsorderbillsplansById(tmsorderbillsplans.getId()));
     }
 
@@ -343,7 +352,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("调度安排箱型数据与计划箱量箱型数据不匹配");
         }
-
         long qty = tmsorderbillscntrs.getCntrPlanQty() - ftmsorderbillsplans.getCntrQty() + tmsorderbillsplans.getCntrQty();
         if (tmsorderbillscntrs.getCntrQty() < tmsorderbillsplans.getCntrQty()) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -354,6 +362,15 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
         }
+        // 计划下达数据
+        Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
+        long cntrQty = tmsorderbillsplans.getCntrQty() - ftmsorderbillsplans.getCntrQty();
+        BigDecimal qtyDisPatch = bills.getQtyDisPatch().add(new BigDecimal(cntrQty));
+        bills.setQtyDisPatch(qtyDisPatch);
+        if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
+        }
         tmsorderbillsplans.setBillStatus(6L);
         tmsorderbillsplans.setCreateTime(new Date());
         tmsorderbillsplans.setCreateBy(loginUser.getUsername());
@@ -393,6 +410,14 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新箱量数据失败，若多次出现请联系管理员");
         }
+        // 计划下达数据
+        Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(plans.getOrgId());
+        BigDecimal qtyDisPatch = bills.getQtyDisPatch().subtract(new BigDecimal(plans.getCntrQty()));
+        bills.setQtyDisPatch(qtyDisPatch);
+        if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
+        }
         // 删除操作
         if ("remove".equals(type)) {
             if (ftmsorderbillsplans.getCarQty() > 0) {
@@ -445,11 +470,12 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     @Transactional
     public AjaxResult saveFtmsorderbills(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(pId);
+        ftmsorderbills.setBillStatus(20L);
+        ftmsorderbills.setUpdateTime(new Date());
+        ftmsorderbills.setUpdateBy(loginUser.getUsername());
+        ftmsorderbillsMapper.updateftmsorderbills(ftmsorderbills);
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
         ftmsorderbillsfees.setfPid(pId);
         ftmsorderbillsfees.setActId(1010L);
@@ -458,7 +484,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         ftmsorderbillsattachs.setPId(pId);
         ftmsorderbillsattachs.setActId(1010L);
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachs(ftmsorderbillsattachs);
-
         if (StringUtils.isNotNull(attachs) && !"[]".equals(attachs)) {
             JSONArray attachsJson = JSONArray.parseArray(attachs);
             List<Ftmsorderbillsattachs> tmsorderbillsattachsList = JSONObject.parseArray(attachsJson.toJSONString(), Ftmsorderbillsattachs.class);
@@ -531,8 +556,8 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("调度安排第" + line + "行未找到车队数据");
                 }
+                p.setOrgId(pId);
                 if (StringUtils.isNull(p.getId())) {
-                    p.setOrgId(pId);
                     p.setBillStatus(2L);
                     p.setCreateTime(new Date());
                     p.setCreateBy(loginUser.getUsername());
@@ -544,7 +569,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
                 }
             }
         }
-        return AjaxResult.success();
+        return AjaxResult.success(ftmsorderbillsplansMapper.selectftmsorderbillsplansByOrgId(pId));
     }
 
     /**

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

@@ -565,6 +565,7 @@
             t.load_attntel AS loadAttntel,
             c.carreg_no AS carregNo,
             c.mblno,
+            c.driverbonus,
             g.f_name AS goodsId,
             c.order_status AS orderStatus,
             c.cntr_qty AS cntrQty,
@@ -573,6 +574,8 @@
             t.voy,
             t.pol_id AS polId,
             t.pod_id AS podId,
+            c.oil_amt AS oilAmt,
+            c.cost_oth AS costOth,
             c.cntr_id AS cntrId,
             c.driver_tel AS driverTel,
             c.driver_name AS driverName,
@@ -580,6 +583,7 @@
             c.carcor_pid AS carcorPid,
             c.driver_tel AS driverTel,
             c.driver_name AS driverName,
+            c.cost_remarks AS costRemarks,
             c.odometer_from AS odometerFrom,
             c.odometer_end AS odometerEnd,
             c.accept_date AS acceptDate,

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

@@ -62,12 +62,14 @@
         SELECT
             plan.id,
             plan.carnolist,
+            plan.car_qty AS carQty,
+            plan.cntr_qty AS cntrQty,
             f.bill_no AS billNo,
             f.act_id AS actId,
             c.f_name AS corpId,
+            sysCntr.dict_label AS cntrName,
             p.nick_name AS planUserId,
             a.nick_name AS transUserId,
-            sysCntr.dict_label AS cntrName,
             type.dict_label AS billType,
             trans.dict_label AS transType,
             prop.dict_label AS transProp,
@@ -86,14 +88,11 @@
             f.qty_plan AS qtyPlan,
             f.qty_dis_patch AS qtyDisPatch,
             f.weight_plan AS weightPlan,
-            f.cntr_desc AS cntrDesc,
             f.bill_status AS billStatus,
-            u.nick_name AS createBy,
             f.create_time AS createTime
-            FROM
+        FROM
             F_TMSORDERBILLSPLANS plan
             LEFT JOIN F_TMSORDERBILLS f ON f.id = plan.org_id
-            LEFT JOIN F_TMSORDERBILLSCNTRS cntr ON cntr.id = plan.p_id
             LEFT JOIN sys_dict_data sysCntr ON sysCntr.dict_type = 'data_cntrId'
             AND sysCntr.dict_value = plan.cntr_id
             LEFT JOIN sys_dict_data type ON type.dict_type = 'data_billType'
@@ -107,7 +106,6 @@
             LEFT JOIN sys_user p ON p.user_id = f.plan_user_id
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id
             LEFT JOIN t_goods g ON g.f_id = f.goods_id
-            LEFT JOIN sys_user u ON u.user_name = f.create_by
         WHERE
             f.id != ''
             <if test="corpId != null and corpId != ''">

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/BillnoDelMapper.java

@@ -58,4 +58,11 @@ public interface BillnoDelMapper {
      * @return 结果
      */
     public int deleteBillnoDelByIds(Long[] ids);
+
+    /**
+     *  查询回收的流水号
+     * @param billnoDel 条件
+     * @return  结果
+     */
+    public BillnoDel selectBillnoDelBillNo(BillnoDel billnoDel);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/BillnoSerialServiceImpl.java

@@ -147,7 +147,7 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
         String yyMMdd = null;
         if ("JH".equals(billType) || "JHBF".equals(billType) || "DDBF".equals(billType) || "JHBGBF".equals(billType)) {
             yyMMdd = DateFormatUtils.format(time, "yyyyMMdd");
-        } else if ("CCF".equals(billType)) {
+        } else if ("CCF".equals(billType) || "SJLSH".equals(billType)) {
             yyMMdd = DateFormatUtils.format(time, "yyMM");
         } else {
             yyMMdd = DateFormatUtils.format(time, "yyMMdd");

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/BillnoDelMapper.xml

@@ -29,6 +29,15 @@
         where id = #{id}
     </select>
 
+    <select id="selectBillnoDelBillNo" parameterType="BillnoDel" resultMap="BillnoDelResult">
+        select id, bill_type, bill_no from billno_del
+        <where>
+            <if test="billType != null  and billType != ''">and bill_type = #{billType}</if>
+            <if test="billNo != null  and billNo != ''">and bill_no = #{billNo}</if>
+            <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
+        </where>
+    </select>
+
     <insert id="insertBillnoDel" parameterType="BillnoDel" useGeneratedKeys="true" keyProperty="id">
         insert into billno_del
         <trim prefix="(" suffix=")" suffixOverrides=",">