插单调整

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsBlankOrderService.java

@@ -4,6 +4,7 @@ import com.rongwei.bsentity.domain.ApsBlankOrderDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsProductionTechnicalRequirementDo;
 import com.rongwei.bsentity.vo.*;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.CriteriaQuery;
 
@@ -56,4 +57,7 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
     R checkSchedule(CheckScheduleReq req);
 
     R productPlanReport(CriteriaQuery req);
+
+    //插单重新排程
+    void insertSchedule(Map<String, Object> params);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsService.java

@@ -13,7 +13,4 @@ public interface ApsService {
 
     ProductionScheduleVo apsProductionScheduleInit(List<ApsBlankOrderVo> apsBlankOrders);
 
-    //插单重新排程
-    void insertSchedule(Map<String, Object> params,SysUserVo currentUser);
-
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2834,6 +2834,15 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         return R.ok(res);
     }
 
+    //插单重新排程
+    @Override
+    public void insertSchedule(Map<String, Object> params) {
+        List<ApsBlankOrderVo> apsBlankOrders = apsBlankOrderDao.getByOrderId(params.get("PRODUCTIONORDERID").toString());
+        if (apsBlankOrders != null && apsBlankOrders.size() > 0) {
+            apsService.apsSchedule(apsBlankOrders, "cd", null);
+        }
+    }
+
     private void doSetMapLoading(Map<String, String> processLoadingMap, List<String> lastProcessIdList, List<ApsProcessOperationDo> processOperationDoList) {
         for (String s : lastProcessIdList) {
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -827,16 +827,6 @@ public class ApsServiceImpl implements ApsService {
         return productionScheduleVo;
     }
 
-    //插单重新排程
-    @Override
-    @Async("taskExecutor")
-    public void insertSchedule(Map<String, Object> params,SysUserVo currentUser) {
-        List<ApsBlankOrderVo> apsBlankOrders = apsBlankOrderDao.getByOrderId(params.get("PRODUCTIONORDERID").toString());
-        if (apsBlankOrders != null && apsBlankOrders.size() > 0) {
-            apsSchedule(apsBlankOrders, "cd",currentUser);
-        }
-    }
-
     private void thMergePs(List<ApsProcessOperationDo> operationDos){
 
     }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsBlankOrderController.java

@@ -9,10 +9,8 @@ import com.rongwei.bsentity.vo.ApsPlanVo;
 import com.rongwei.bsentity.vo.CheckAndSaveOrUpdateBlankReq;
 import com.rongwei.bsentity.vo.CheckScheduleReq;
 import com.rongwei.bsentity.vo.OrderLockVo;
-import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.CriteriaQuery;
-import com.rongwei.safecommon.utils.CXCommonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -135,16 +133,7 @@ public class ApsBlankOrderController {
         try {
             log.info("插单;参数为：{}", params);
             R resData = apsBlankOrderService.insertOrder(params);
-            if (resData.getCode().equals("200")) {
-                //获取当前用户相关信息
-                SysUserVo currentUser = CXCommonUtils.getCurrentUser();
-                //重新排程
-                apsService.insertSchedule(params,currentUser);
-
-                return resData;
-            } else {
-                return R.error();
-            }
+            return resData;
         } catch (Exception e) {
             e.printStackTrace();
             log.info("插单异常:" + e.getMessage());
@@ -152,6 +141,15 @@ public class ApsBlankOrderController {
         }
     }
 
+    /*
+    插单后重排
+     */
+    @PostMapping("/insertSchedule")
+    public void insertSchedule(@RequestBody Map<String, Object> params) {
+        log.info("插单后重排;参数为：{}", params);
+        apsBlankOrderService.insertSchedule(params);
+    }
+
     /**
      * 校验和保存坯料计划
      */