aps-自动调度排程改为冷轧1天，退火5天

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsBlankOrderDao.java

@@ -181,7 +181,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
 
     List<ApsBlankOrderDo> selectBlankByStartNum(@Param("startNum") String startNum);
 
-    int moveErrorProcessEqu(@Param("chongpaiStartDate") DateTime chongpaiStartDate, @Param("chongpaiEndDate") DateTime chongpaiEndDate, @Param("tenantId") String tenantId, @Param("workshopin") Integer workshopin, @Param("workshopcross") Integer workshopcross);
+    int moveErrorProcessEqu(@Param("chongpaiStartDate") DateTime chongpaiStartDate, @Param("chongpaiEndDate") DateTime chongpaiEndDate, @Param("tenantId") String tenantId, @Param("workshopin") Integer workshopin, @Param("workshopcross") Integer workshopcross, @Param("type") String type);
 
     int moveErrorProcessEqu2(@Param("chongpaiStartDate") DateTime chongpaiStartDate, @Param("chongpaiEndDate") DateTime chongpaiEndDate, @Param("tenantId") String tenantId);
 

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

@@ -71,7 +71,7 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
 
     R checkAddMaterial(AddMaterialReq req);
 
-    void apsScheduleRestart(Integer hour,String chongpaiStartDateStr,String chongpaiEndDateStr,SysUserVo currentUser, String blankId, Boolean haveLenZha, Boolean haveTuiHuo);
+    void apsScheduleRestart(Integer hour,String chongpaiStartDateStr,String chongpaiEndDateStr,SysUserVo currentUser, String blankId, Boolean haveLenZha, Boolean haveTuiHuo, Boolean needPushData);
 
     void sortLenZha(DateTime chongpaiEndDate, String tenantId);
 

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

@@ -4358,7 +4358,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     @Override
-    public void apsScheduleRestart(Integer hour, String chongpaiStartDateStr, String chongpaiEndDateStr, SysUserVo currentUser, String blankIds, Boolean haveLenZha, Boolean haveTuiHuo) {
+    public void apsScheduleRestart(Integer hour, String chongpaiStartDateStr, String chongpaiEndDateStr, SysUserVo currentUser, String blankIds, Boolean haveLenZha, Boolean haveTuiHuo, Boolean needPushData) {
         if (currentUser == null) {
             currentUser = CXCommonUtils.getCurrentUser();
         }
@@ -4417,19 +4417,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
             //将实际完工时间大于明天的作业挪到实际完工时间
             this.baseMapper.updateFinishDateAboutProcessEqu(needScheduleDate, tenantId, chongpaiStartDate, chongpaiEndDate);
-            //错误数据纠正挪动
-            int safeCount = 0;
-            while (true) {
-                int updateCount = this.baseMapper.moveErrorProcessEqu(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser), apsScheduleConfigDo.getWorkshopin(), apsScheduleConfigDo.getWorkshopcross());
-                if (updateCount <= 0) {
-                    break;
-                }
-                //安全设置，防止死循环
-                safeCount += 1;
-                if (safeCount >= 50) {
-                    break;
-                }
-            }
 //            int safeCount2 = 0;
 //            while (true) {
 //                int updateCount2 = this.baseMapper.moveErrorProcessEqu2(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser));
@@ -4526,12 +4513,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .set(ApsProcessOperationDo::getLockmark, "n")
                         .in(ApsProcessOperationDo::getId, unLockingProcessIdList));
             }
-
-            log.info("开始推算调度时间之后的重叠数据");
-            //推算非退火、非铸轧的重叠数据，按序排列
-            sortLenZha(chongpaiEndDate, tenantId);
-            //推算退火，按序排列
-            sortTuiHuo(chongpaiEndDate, tenantId);
+            if (needPushData) {
+                log.info("开始推算调度时间之后的重叠数据");
+                //推算非退火、非铸轧的重叠数据，按序排列
+                sortLenZha(chongpaiEndDate, tenantId);
+                //推算退火，按序排列
+                sortTuiHuo(chongpaiEndDate, tenantId);
+            }
             log.info("调度排程结束");
         }
     }
@@ -4788,7 +4776,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
         try {
-            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null, true, true);
+            //冷轧1天
+            String lenzhaEndDate = DateUtil.format(DateUtil.offsetDay(DateUtil.parse(needScheduleStartDate), 1), "yyyy-MM-dd HH:mm:ss");
+            apsScheduleRestart(null, needScheduleStartDate, lenzhaEndDate, currentUser, null, true, false, false);
+            //退火5天
+            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null, false, true, true);
         } catch (Exception e) {
             log.error(e);
             return "success";
@@ -4853,6 +4845,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     private void tuihuoChongpai(DateTime chongpaiStartDate, DateTime chongpaiEndDate, ApsScheduleConfigDo apsScheduleConfigDo, SysUserVo currentUser, List<String> blankIdsList) {
+        //错误数据纠正挪动
+        int safeCount = 0;
+        while (true) {
+            int updateCount = this.baseMapper.moveErrorProcessEqu(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser), apsScheduleConfigDo.getWorkshopin(), apsScheduleConfigDo.getWorkshopcross(), "退火");
+            if (updateCount <= 0) {
+                break;
+            }
+            //安全设置，防止死循环
+            safeCount += 1;
+            if (safeCount >= 50) {
+                break;
+            }
+        }
         //退火重排
         //查询在重排时间段的所有作业明细信息,只包括：成退、中退、小卷成退
         List<ApsProcessOperationProcessEquDo> needScheduleList = this.baseMapper.selectNeedRescheduleEqu2(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser), apsScheduleConfigDo.getWorkshopin(), apsScheduleConfigDo.getWorkshopcross(), blankIdsList);
@@ -4953,6 +4958,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     private void lenzhaChongpai(DateTime chongpaiStartDate, DateTime chongpaiEndDate, ApsScheduleConfigDo apsScheduleConfigDo, SysUserVo currentUser, List<String> blankIdsList) {
+        //错误数据纠正挪动
+        int safeCount = 0;
+        while (true) {
+            int updateCount = this.baseMapper.moveErrorProcessEqu(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser), apsScheduleConfigDo.getWorkshopin(), apsScheduleConfigDo.getWorkshopcross(), "冷轧");
+            if (updateCount <= 0) {
+                break;
+            }
+            //安全设置，防止死循环
+            safeCount += 1;
+            if (safeCount >= 50) {
+                break;
+            }
+        }
         //查询需要重排的所有明细信息
         List<ApsProcessOperationProcessEquDo> needScheduleList = this.baseMapper.selectNeedRescheduleEqu3(chongpaiStartDate, chongpaiEndDate, CXCommonUtils.getCurrentUserFactoryId(currentUser), apsScheduleConfigDo.getWorkshopin(), apsScheduleConfigDo.getWorkshopcross(), blankIdsList);
         if (needScheduleList.isEmpty()) {

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -344,7 +344,12 @@
             apope.deleted = '0' AND apo.DELETED = '0' AND preapope.DELETED = '0'
           and apope.TENANTID = #{tenantId}
           and apo.PROCESS != '铸轧'
-          and apope.WORKSTATUS = '待开工'
+            <if test="type != '' and type != null and type == '冷轧'">
+                AND apo.PROCESS NOT IN ('铸轧','中退','成退','小卷成退')
+            </if>
+            <if test="type != '' and type != null and type == '退火'">
+                AND apo.PROCESS IN ('中退','成退','小卷成退')
+            </if>
           AND ((apope.PLANSTARTDATE between #{chongpaiStartDate} and #{chongpaiEndDate}) -- 在调度时间范围内开工
             or ((preapope.PLANSTARTDATE between #{chongpaiStartDate} and #{chongpaiEndDate}) -- 前道在调度时间范围内开工
                 AND (

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

@@ -74,7 +74,7 @@ public class ApsBlankOrderController {
                                 @RequestParam(required = false) String blankIds,
                                 @RequestParam(required = false) Boolean haveLenZha,
                                 @RequestParam(required = false) Boolean haveTuiHuo) throws Exception {
-        apsBlankOrderService.apsScheduleRestart(hour, chongpaiStartDate, chongpaiEndDate, null, blankIds,haveLenZha,haveTuiHuo);
+        apsBlankOrderService.apsScheduleRestart(hour, chongpaiStartDate, chongpaiEndDate, null, blankIds,haveLenZha,haveTuiHuo,true);
         return R.ok();
     }