插单优化

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

@@ -26,7 +26,6 @@ import com.rongwei.safecommon.utils.CXCommonUtils;
 import com.rongwei.safecommon.utils.SaveConstans;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +42,6 @@ import static com.rongwei.bscommon.sys.service.impl.ApsProductionOrderServiceImp
 import static com.rongwei.bscommon.sys.utils.ApsUtils.addNewConflictsDesc;
 import static com.rongwei.safecommon.utils.SaveConstans.DatePattern.DATE_PATTERN_YMDHMS;
 import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.EXCEEDING_THE_PROMISED_DELIVERY_DEADLINE;
-import static com.rongwei.safecommon.utils.SaveConstans.JobStatus.JOBSTATUS_TO_BE_START;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_N;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_Y;
 import static com.rongwei.safecommon.utils.SaveConstans.ProductionStatus.*;
@@ -352,13 +350,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .set(ApsBlankOrderDo::getLockmark, LOCKMARK_N));
 
         // 解锁该坯料计划所有作业明细，设置是否锁定=否
-        boolean bool2 = apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                .eq(ApsProcessOperationProcessEquDo::getBlankid, blankOrderId)
-                .set(ApsProcessOperationProcessEquDo::getLockmark, LOCKMARK_N));
+        boolean bool2 = apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                .eq(ApsProcessOperationDo::getBlankid, blankOrderId)
+                .set(ApsProcessOperationDo::getLockmark, LOCKMARK_N));
 
         if (bool1 && bool2) {
-            //重新排程
-            this.apsReScheduling();
             R r = new R();
             r.setCode("200");
             r.setMsg("正在插单重排，并已自动备份排程结果，如果重排结果不满意，可以恢复排程结果");

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

@@ -128,6 +128,10 @@ public class ApsBlankOrderController {
         try {
             log.info("插单;参数为：{}", params);
             R resData = apsBlankOrderService.insertOrder(params);
+            if (resData.getCode().equals("200")) {
+                //重新排程
+                apsBlankOrderService.apsReScheduling();
+            }
             return resData;
         } catch (Exception e) {
             e.printStackTrace();