修改陆运财务模块问题，添加数据库触发器自动更新已派车数量

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -264,6 +264,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
     }
 
     @Override
+    @Transactional
     public AjaxResult confirm(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
         FTmsaccbills fTmsaccbills = JSONArray.parseObject(tfee, FTmsaccbills.class);
         fTmsaccbills.setFBillstatus(4L);
@@ -283,13 +284,10 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
                 String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
                 fTmsaccbills.setFBillno(billNo);
             }
-            fTmsaccbills.setCreateBy(loginUser.getUser().getUserName());
-            fTmsaccbills.setCreateTime(new Date());
-            // 业务编码
-            Date time = new Date();
-            String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
-            fTmsaccbills.setFBillno(billNo);
             fTmsaccbills.setFBilltype(fBilltype);
+            fTmsaccbills.setCreateTime(new Date());
+            fTmsaccbills.setFDeptid(loginUser.getUser().getDeptId());
+            fTmsaccbills.setCreateBy(loginUser.getUser().getUserName());
             fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
         } else {
             fTmsaccbills.setUpdateBy(loginUser.getUser().getUserName());
@@ -303,7 +301,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         List<FTmsaccbillsitems> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), FTmsaccbillsitems.class);
         for (FTmsaccbillsitems tFeeDo : tFeeDoList) {
             tFeeDo.setCreateTime(new Date());
-            tFeeDo.setFSrcid(fTmsaccbills.getId());
+            tFeeDo.setFPid(fTmsaccbills.getId());
             tFeeDo.setCreateBy(loginUser.getUser().getUserName());
             fTmsaccbillsitemsMapper.insertFTmsaccbillsitems(tFeeDo);
             // 跟新费用明细
@@ -325,7 +323,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
     public int updateBillsFees(Long fid, FTmsaccbillsitems tFeeDo, String billsType) {
         // 查询从表数据
         FTmsaccbills tFee = fTmsaccbillsMapper.selectFTmsaccbillsById(fid);
-        if (billsType.equals("SFDZ") || billsType.equals("JSFF")) {
+        if ("SFDZ".equals(billsType) || "JSFF".equals(billsType) || "JSSF".equals(billsType)) {
             billsType = "DZ";
         }
         Map<String, Object> map = new HashMap<>();

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

@@ -645,16 +645,14 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         }
         ftmsorderbillscars.setMblno(tmsorderbills.getMblno());
         ftmsorderbillscars.setOrgId(ftmsorderbillsplans.getOrgId());
-        ftmsorderbillsplans.setCarQty(carQty);
         if (ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
         map.put("plan", ftmsorderbillsplans);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillsplans.getOrgId());
+
         Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(ftmsorderbillsplans.getPId());
-        ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() + ftmsorderbillscars.getCntrQty());
-        ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
         // 应收运价
         ftmsorderbillscars.setFreightPriceDr(ftmsorderbillscntrs.getPriceDr());
         // 应付运价
@@ -714,22 +712,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         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("更新调度安排失败，若多次出现请联系管理员");
-        }
-        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(tmsorderbillsplans.getPId());
-        ftmsorderbillscntrs.setPlanQty(ftmsorderbillscntrs.getPlanQty() - ftmsorderbillscars.getCntrQty());
-        ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs);
-        map.put("plan", tmsorderbillsplans);
+        map.put("plan", ftmsorderbillsplansMapper.selectftmsorderbillsplansById(ftmsorderbillscars.getPId()));
         map.put("cars", ftmsorderbillscars);
         return AjaxResult.success(map);
     }

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

@@ -287,20 +287,15 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("调度数量超出计划箱量不可提交");
         }
-        ftmsorderbillscntrs.setCntrPlanQty(qty);
-        if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
         // 计划下达数据
-        Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
+       /* Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
         bills.setPlanUserId(loginUser.getUser().getUserId());
         bills.setPlanUserName(loginUser.getUser().getNickName());
         bills.setQtyDisPatch(bills.getQtyDisPatch() + tmsorderbillsplans.getCntrQty());
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
+        }*/
         Map<String, Object> map = new HashMap<>();
         Ftmsorderbillscntrs tmsorderbillscntrs = new Ftmsorderbillscntrs();
         tmsorderbillscntrs.setOrgId(tmsorderbillsplans.getOrgId());
@@ -362,19 +357,19 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("调度数量超出计划箱量不可提交");
         }
-        tmsorderbillscntrs.setCntrPlanQty(qty);
+        /*tmsorderbillscntrs.setCntrPlanQty(qty);
         if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(tmsorderbillscntrs) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
+        }*/
         // 计划下达数据
-        Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
+        /*Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
         long cntrQty = ftmsorderbillsplans.getCntrQty() - tmsorderbillsplans.getCntrQty();
         bills.setQtyDisPatch(bills.getQtyDisPatch() + cntrQty);
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
+        }*/
         tmsorderbillsplans.setBillStatus(6L);
         tmsorderbillsplans.setCreateTime(new Date());
         tmsorderbillsplans.setCreateBy(loginUser.getUsername());
@@ -428,7 +423,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             return AjaxResult.error("操作失败，该单据未提交");
         }
         // 查询箱量
-        Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(plans.getPId());
+        /*Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(plans.getPId());
         long planQty = ftmsorderbillscntrs.getCntrPlanQty() - plans.getCntrQty();
         ftmsorderbillscntrs.setCntrPlanQty(planQty);
         if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
@@ -441,7 +436,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
-        }
+        }*/
         String planJson = JSON.toJSONString(ftmsorderbillsplans);
         Date time = new Date();
         // 调度备份流水号