插单调整

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

@@ -4,11 +4,15 @@ import com.rongwei.bsentity.vo.ApsBlankOrderVo;
 import com.rongwei.bsentity.vo.ProductionScheduleVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ApsService {
 
-    void apsSchedule(List<ApsBlankOrderVo> apsBlankOrders,String apsType);
+    void apsSchedule(List<ApsBlankOrderVo> apsBlankOrders, String apsType);
 
     ProductionScheduleVo apsProductionScheduleInit(List<ApsBlankOrderVo> apsBlankOrders);
 
+    //插单重新排程
+    void insertSchedule(Map<String, Object> params);
+
 }

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

@@ -72,6 +72,8 @@ public class ApsServiceImpl implements ApsService {
     private ApsFurnaceInstallationService apsFurnaceInstallationService;
     @Autowired
     private ApsMergeFurnaceService apsMergeFurnaceService;
+    @Autowired
+    private ApsProductionOrderService apsProductionOrderService;
 
     /**
      * Aps排程
@@ -819,6 +821,16 @@ public class ApsServiceImpl implements ApsService {
         return productionScheduleVo;
     }
 
+    //插单重新排程
+    @Override
+    @Async("taskExecutor")
+    public void insertSchedule(Map<String, Object> params) {
+        List<ApsBlankOrderVo> apsBlankOrders = apsBlankOrderDao.getByOrderId(params.get("PRODUCTIONORDERID").toString());
+        if (apsBlankOrders != null && apsBlankOrders.size() > 0) {
+            apsSchedule(apsBlankOrders, "cd");
+        }
+    }
+
     private void thMergePs(List<ApsProcessOperationDo> operationDos){
 
     }

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

@@ -5,14 +5,16 @@ import com.rongwei.bscommon.sys.service.ApsBlankOrderService;
 import com.rongwei.bscommon.sys.service.ApsService;
 import com.rongwei.bsentity.domain.ApsBlankOrderDo;
 import com.rongwei.bsentity.domain.ApsProductionTechnicalRequirementDo;
-import com.rongwei.bsentity.vo.*;
+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.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.CriteriaQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -133,12 +135,8 @@ public class ApsBlankOrderController {
             R resData = apsBlankOrderService.insertOrder(params);
             if (resData.getCode().equals("200")) {
                 //重新排程
-                Thread thread = new Thread(() -> {
-//                        apsBlankOrderService.apsReScheduling();
-                    List<ApsBlankOrderVo> apsBlankOrders = new ArrayList<>();
-                    apsService.apsSchedule(apsBlankOrders,null);
-                });
-                thread.start(); // 启动线程
+                apsService.insertSchedule(params);
+
                 return resData;
             } else {
                 return R.error();
@@ -196,7 +194,7 @@ public class ApsBlankOrderController {
      * 生产计划跟踪报表
      */
     @PostMapping("/productPlanReport")
-    public R productPlanReport(@RequestBody CriteriaQuery req){
+    public R productPlanReport(@RequestBody CriteriaQuery req) {
         log.info("生产计划跟踪报表，入参为：{}", req);
         return apsBlankOrderService.productPlanReport(req);
     }