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

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

@@ -205,8 +205,7 @@ public class ftmsorderbillscarsController extends BaseController {
         if (StringUtils.isNull(id)) {
             return AjaxResult.error("未找到查询条件，请确认");
         }
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return ftmsorderbillscarsService.vehicleOperationChanges(id, loginUser);
+        return ftmsorderbillscarsService.vehicleOperationChanges(id);
     }
 
     /**

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

@@ -118,10 +118,9 @@ public interface IftmsorderbillscarsService {
     /**
      *  车辆安排 变更
      * @param id        安排id
-     * @param loginUser 用户
      * @return  结果
      */
-    public AjaxResult vehicleOperationChanges(Long id, LoginUser loginUser);
+    public AjaxResult vehicleOperationChanges(Long id);
 
     /**
      *  车辆派车主表变更

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

@@ -352,19 +352,15 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
             // 计划变更
             billStatus = true;
         }
-        if (billStatus && tmsorderbills.getBillStatus() == 20) {
+        if (billStatus && tmsorderbills.getBillStatus() == 3L) {
+            return AjaxResult.error("计划单据已撤销无法变更");
+        } else if (billStatus && tmsorderbills.getBillStatus() < 6L) {
             return AjaxResult.error("计划单据未提交无法变更");
-        } else if (billStatus && tmsorderbills.getBillStatus() == 30) {
-            return AjaxResult.error("计划单据已被撤销无法变更");
-        } else if (billStatus && tmsorderbills.getBillStatus() == 50) {
-            return AjaxResult.error("计划单据已在变更中");
         }
-        if (!billStatus && tmsorderbills.getBillStatus() == 60) {
-            return AjaxResult.error("调度单据未提交无法变更");
-        } else if (!billStatus && tmsorderbills.getBillStatus() == 70) {
+        if (!billStatus && tmsorderbills.getBillStatus() == 30L) {
             return AjaxResult.error("调度单据已被撤销无法变更");
-        } else if (!billStatus && tmsorderbills.getBillStatus() == 90) {
-            return AjaxResult.error("调度单据已在变更中");
+        } else if (billStatus && tmsorderbills.getBillStatus() < 60L) {
+            return AjaxResult.error("调度单据未提交无法变更");
         }
         return AjaxResult.success();
     }

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

@@ -327,28 +327,28 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
             if (StringUtils.isNull(tmsorderbillscars.getWaybillDate())) {
                 return AjaxResult.error("未找到还卸柜时间");
             }
-            tmsorderbillscars.setOrderStatus(60L);
+            tmsorderbillscars.setOrderStatus(80L);
         } else if ("unLoadDate".equals(operationType)) {
             // 还卸柜提交
             orderStatus = 1060L;
             if (StringUtils.isNull(tmsorderbillscars.getUnLoadDate())) {
                 return AjaxResult.error("未找到还卸柜时间");
             }
-            tmsorderbillscars.setOrderStatus(50L);
+            tmsorderbillscars.setOrderStatus(60L);
         } else if ("mdLoadDate".equals(operationType)) {
             // 装卸货提交
             orderStatus = 1050L;
             if (StringUtils.isNull(tmsorderbillscars.getMdLoadDate())) {
                 return AjaxResult.error("未找到装卸货时间");
             }
-            tmsorderbillscars.setOrderStatus(40L);
+            tmsorderbillscars.setOrderStatus(50L);
         } else if ("loadDate".equals(operationType)) {
             // 提箱提交
             orderStatus = 1040L;
             if (StringUtils.isNull(tmsorderbillscars.getLoadDate())) {
                 return AjaxResult.error("未找到提箱时间");
             }
-            tmsorderbillscars.setOrderStatus(30L);
+            tmsorderbillscars.setOrderStatus(40L);
         } else if ("acceptDate".equals(operationType)) {
             // 接单提交
             orderStatus = 1030L;
@@ -619,29 +619,23 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
 
 
     /**
-     * 单条车辆安排 变更
+     * 单条车辆安排 是否允许变更
      *
      * @param id        安排id
-     * @param loginUser 用户
      * @return 结果
      */
     @Override
     @Transactional
-    public AjaxResult vehicleOperationChanges(Long id, LoginUser loginUser) {
+    public AjaxResult vehicleOperationChanges(Long id) {
         Ftmsorderbillscars ftmsorderbillscars = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(id);
         if (StringUtils.isNull(ftmsorderbillscars)) {
             return AjaxResult.error("未找到车辆信息，请确认");
         }
-        if (ftmsorderbillscars.getBillStatus() != 6) {
-            log.info("车辆安排信息异常：" + ftmsorderbillscars.getBillStatus());
-            return AjaxResult.error("车辆安排信息异常，请确认");
-        }
-        ftmsorderbillscars.setBillStatus(5L);
-        ftmsorderbillscars.setUpdateTime(new Date());
-        ftmsorderbillscars.setUpdateBy(loginUser.getUsername());
-        if (ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars) <= 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("更新车辆安排变更状态失败，若多次失败请联系管理员");
+        Long billStatus = ftmsorderbillscars.getBillStatus();
+        if (billStatus == 3L) {
+            return AjaxResult.error("车辆安排信息已撤销无法变更");
+        } else if (billStatus < 6) {
+            return AjaxResult.error("车辆安排信息未提交无法变更");
         }
         return AjaxResult.success();
     }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -167,9 +167,9 @@
         <where>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and f_mblno = #{fMblno}</if>
+            <if test="fWarehouseLocationid != null ">and f_warehouse_locationid = #{fWarehouseLocationid}</if>
             <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
             <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>
-            <if test="fWarehouseLocationid != null ">and f_warehouse_locationid = #{fWarehouseLocationid}</if>
         </where>
     </select>