优化计划下达的变更提交接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsplansController.java

@@ -171,20 +171,6 @@ public class ftmsorderbillsplansController extends BaseController {
     }
 
     /**
-     * 计划取消/撤回
-     */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:edit')")
-    @Log(title = "订单调度", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/scheduleCancel")
-    public AjaxResult scheduleCancel(@RequestBody Ftmsorderbills ftmsorderbills) {
-        if (StringUtils.isNull(ftmsorderbills) || StringUtils.isNull(ftmsorderbills.getId())) {
-            return AjaxResult.error("未找到计划主表数据，请确认");
-        }
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return ftmsorderbillsplansService.scheduleCancel(ftmsorderbills, loginUser);
-    }
-
-    /**
      * 保存订单调度
      */
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:add')")

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsplansService.java

@@ -105,14 +105,6 @@ public interface IftmsorderbillsplansService {
     AjaxResult schedulingRevoke(Ftmsorderbillsplans plans, String type, LoginUser loginUser);
 
     /**
-     *  业务调度撤销
-     * @param ftmsorderbills    计划数据
-     * @param loginUser 操作人
-     * @return  结果
-     */
-    AjaxResult scheduleCancel(Ftmsorderbills ftmsorderbills, LoginUser loginUser);
-
-    /**
      *  调度变更提交
      * @param tmsorder  机会主表
      * @param plans     调度

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

@@ -236,13 +236,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         if (StringUtils.isNull(tmsorderbills.getBillStatus())) {
             return AjaxResult.error("未找到单据状态，请确认");
         }
-        if (tmsorderbills.getBillStatus() == 40) {
+        if (tmsorderbills.getBillStatus() == 6L) {
             if (StringUtils.isNull(scntrs) || "[]".equals(scntrs)) {
                 return AjaxResult.error("未找到计划货量数据，请确认");
             }
             tmsorderbills.setPostDate(new Date());
-        }
-        if (tmsorderbills.getBillStatus() == 40) {
             String status = dataValidation(scntrs, attachs, fees, plans, null);
             if (StringUtils.isNotEmpty(status)) {
                 return AjaxResult.error(status);
@@ -279,11 +277,6 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         ftmsorderbillscntrsMapper.deleteftmsorderbillscntrsByPId(pId);
         ftmsorderbillsplansMapper.deleteftmsorderbillsplansByOrgId(pId);
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachsByPId(pId);
-        if (tmsorderbills.getBillStatus() == 40) {
-            tmsorderbills.setBillStatus(6L);
-        } else {
-            tmsorderbills.setBillStatus(2L);
-        }
         AjaxResult ajaxResult = updateItem(pId, tmsorderbills.getBillStatus(), scntrs, attachs, fees, plans, loginUser);
         String code = ajaxResult.get("code").toString();
         if ("500".equals(code)) {
@@ -355,7 +348,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     public AjaxResult planStatusChange(Ftmsorderbills ftmsorderbills) {
         Ftmsorderbills tmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbills.getId());
         boolean billStatus = false;
-        if (ftmsorderbills.getBillType() == 1000) {
+        if (ftmsorderbills.getActId() == 1000) {
             // 计划变更
             billStatus = true;
         }
@@ -373,12 +366,6 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         } else if (!billStatus && tmsorderbills.getBillStatus() == 90) {
             return AjaxResult.error("调度单据已在变更中");
         }
-        Ftmsorderbills tmsorder = new Ftmsorderbills();
-        tmsorder.setId(ftmsorderbills.getId());
-        tmsorder.setBillStatus(90L);
-        if (ftmsorderbillsMapper.updateftmsorderbills(tmsorder) <= 0) {
-            return AjaxResult.error("更新计划信息失败，若多次出现请联系管理员");
-        }
         return AjaxResult.success();
     }
 
@@ -398,7 +385,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     public AjaxResult insertPlanChange(String tmsorder, String scntrs, String attachs, String fees, String plans, LoginUser loginUser) {
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
         long pId = tmsorderbills.getId();
-        tmsorderbills.setBillStatus(40L);
+        tmsorderbills.setBillStatus(6L);
         Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbills.getId());
         ProjectBillsHistory projectBillsHistory = new ProjectBillsHistory();
         projectBillsHistory.setProjectId(pId);
@@ -643,18 +630,18 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
     public AjaxResult planCancel(Ftmsorderbills ftmsorderbills, LoginUser loginUser) {
         Ftmsorderbills sorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbills.getId());
         boolean billsStatus = false;
-        if (sorderbills.getBillStatus() == 1000) {
+        if (sorderbills.getActId() == 1000) {
             // 计划下达
             billsStatus = true;
         }
-        if (billsStatus && sorderbills.getBillStatus() == 30) {
-            return AjaxResult.error("该计划已撤销");
-        } else if (!billsStatus && sorderbills.getBillStatus() == 70) {
-            return AjaxResult.error("该调度已撤销");
+        if (billsStatus && sorderbills.getBillStatus() == 3L) {
+            return AjaxResult.error("该数据计划已撤销");
+        } else if (!billsStatus && sorderbills.getBillStatus() == 30L) {
+            return AjaxResult.error("该数据调度已撤销");
         }
-        if (billsStatus && sorderbills.getBillStatus() < 40) {
+        if (billsStatus && sorderbills.getBillStatus() < 6L) {
             return AjaxResult.error("该计划未提交，不可撤销");
-        } else if (!billsStatus && sorderbills.getBillStatus() < 80) {
+        } else if (!billsStatus && sorderbills.getBillStatus() < 60L) {
             return AjaxResult.error("该调度未提交，不可撤销");
         }
         Ftmsorderbillsplans tmsorderbillsplans = new Ftmsorderbillsplans();
@@ -663,9 +650,9 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             return AjaxResult.error("该计划已进行调度安排，不可撤销");
         }
         if (billsStatus) {
-            ftmsorderbills.setBillStatus(30L);
+            ftmsorderbills.setBillStatus(3L);
         } else {
-            ftmsorderbills.setBillStatus(70L);
+            ftmsorderbills.setBillStatus(30L);
         }
         if (ftmsorderbillsMapper.updateftmsorderbills(ftmsorderbills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -154,13 +154,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         if (ftmsorderbillsplans.getBillStatus() > 6) {
             return AjaxResult.error("该数据已在车队派车操作无法变更");
         }
-        ftmsorderbillsplans.setBillStatus(70L);
-        ftmsorderbillsplans.setUpdateTime(new Date());
-        ftmsorderbillsplans.setUpdateBy(loginUser.getUsername());
-        if (ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新调度安排变更状态失败，若多次失败请联系管理员");
-        }
         return AjaxResult.success();
     }
 
@@ -656,23 +649,4 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         return AjaxResult.success();
     }
 
-    /**
-     * 业务调度撤销
-     *
-     * @param ftmsorderbills 计划数据
-     * @param loginUser      操作人
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public AjaxResult scheduleCancel(Ftmsorderbills ftmsorderbills, LoginUser loginUser) {
-        ftmsorderbills.setBillStatus(60L);
-        ftmsorderbills.setUpdateTime(new Date());
-        ftmsorderbills.setUpdateBy(loginUser.getUsername());
-        if (ftmsorderbillsMapper.updateftmsorderbills(ftmsorderbills) <= 0) {
-            return AjaxResult.error("更新调度计划失败，若多次失败请联系管理员");
-        }
-        return AjaxResult.success();
-    }
-
 }