aps-调度重排

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

@@ -4109,9 +4109,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            this.baseMapper.removeLockNextTwoDayProcessEqu(needScheduleDate);
             String scheduletype = apsScheduleConfigDo.getScheduletype();
             ApsTypeVo apsTypeVo = BeanUtil.toBean(scheduletype, ApsTypeVo.class);
-            apsTypeVo.setMixIf("mix");
-            apsTypeVo.setThMergeMode("notThMergeBf");
-            apsTypeVo.setConstraintMode("lz");
+//            apsTypeVo.setMixIf("mix");
+//            apsTypeVo.setThMergeMode("notThMergeBf");
+//            apsTypeVo.setConstraintMode("lz");
             //重新排程
             apsService.apsSchedule(new ArrayList<>(), apsTypeVo, null,needUnLockProcessIdList);
         }

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

@@ -149,7 +149,7 @@ public class ApsServiceImpl implements ApsService {
                 if(apsType != null && StrUtil.isNotBlank(apsType.getMixIf()) && "mix".equals(apsType.getMixIf())){
                     lzlxOrderSchedule(apsBlankOrders,currentUser,apsType,needUnLockProcessIdList);
                 }else{
-                    apsOrderScheduleNew(apsBlankOrders,currentUser,apsType);
+                    apsOrderScheduleNew(apsBlankOrders,currentUser,apsType,needUnLockProcessIdList);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -339,7 +339,7 @@ public class ApsServiceImpl implements ApsService {
         });
     }
 
-    private void apsOrderScheduleNew(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser,ApsTypeVo apsType){
+    private void apsOrderScheduleNew(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser,ApsTypeVo apsType,List<String> needUnLockProcessIdList){
         // 插单重排的优先排程
         List<ApsBlankOrderVo> cdorders = apsBlankOrders.stream().filter(v -> "1".equals(v.getCdbs())).collect(Collectors.toList());
         // 先按合金，合金状态分组，再每组分别排程
@@ -366,7 +366,7 @@ public class ApsServiceImpl implements ApsService {
         Date finalApsPlanStartDate = apsPlanStartDate;
         if(cdorders != null && cdorders.size()>0){
             try{
-                apsOrderScheduleApsNew(cdorders,currentUser,allEqs, finalApsPlanStartDate,apsType,null);
+                apsOrderScheduleApsNew(cdorders,currentUser,allEqs, finalApsPlanStartDate,apsType,needUnLockProcessIdList);
             }catch (Exception e) {
                 e.printStackTrace();
                 logger.info("排程异常",e);