Merge branch 'mode-min-unit' into mode-min-unit-交期偏差

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, Boolean needPushData);
+    void apsScheduleRestart(Integer hour,String chongpaiStartDateStr,String chongpaiEndDateStr,SysUserVo currentUser, String blankId, Boolean haveLenZha, Boolean haveTuiHuo);
 
     void sortLenZha(DateTime chongpaiEndDate, String tenantId);
 

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

@@ -3084,7 +3084,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     }
                     outputResult += "mm";
                     if (ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getOutputonerollweigth()) && ObjectUtil.isNotEmpty(apsProcessOutputProductDo.getPlanoutputorderroll())) {
-                        outputResult += (" " + apsProcessOutputProductDo.getOutputonerollweigth() + "吨 * " + apsProcessOutputProductDo.getPlanoutputorderroll() + "卷");
+                        outputResult += (" " + CXCommonUtils.removeExtraZerosAndDecimal(apsProcessOutputProductDo.getOutputonerollweigth()) + "吨 * " + apsProcessOutputProductDo.getPlanoutputorderroll() + "卷");
                     }
 
 
@@ -4373,7 +4373,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, Boolean needPushData) {
+    public void apsScheduleRestart(Integer hour, String chongpaiStartDateStr, String chongpaiEndDateStr, SysUserVo currentUser, String blankIds, Boolean haveLenZha, Boolean haveTuiHuo) {
         if (currentUser == null) {
             currentUser = CXCommonUtils.getCurrentUser();
         }
@@ -4485,6 +4485,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             .eq(ApsProcessOperationDo::getLockmark, "n")
                             .eq(ApsProcessOperationDo::getTenantid, tenantId));
                 }
+                log.info("开始推算冷轧调度时间之后的重叠数据");
+                //推算非退火、非铸轧的重叠数据，按序排列
+                sortLenZha(chongpaiEndDate, tenantId);
             }
             if (haveTuiHuo) {
                 try {
@@ -4510,6 +4513,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                             .eq(ApsProcessOperationDo::getLockmark, "n")
                             .eq(ApsProcessOperationDo::getTenantid, tenantId));
                 }
+                log.info("开始推算退火调度时间之后的重叠数据");
+                //推算退火，按序排列
+                sortTuiHuo(chongpaiEndDate, tenantId);
             }
             //调度排程结束
             //将之前锁定的作业和明细重新解锁
@@ -4528,13 +4534,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .set(ApsProcessOperationDo::getLockmark, "n")
                         .in(ApsProcessOperationDo::getId, unLockingProcessIdList));
             }
-            if (needPushData) {
-                log.info("开始推算调度时间之后的重叠数据");
-                //推算非退火、非铸轧的重叠数据，按序排列
-                sortLenZha(chongpaiEndDate, tenantId);
-                //推算退火，按序排列
-                sortTuiHuo(chongpaiEndDate, tenantId);
-            }
             log.info("调度排程结束");
         }
     }
@@ -4793,9 +4792,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         try {
             //冷轧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);
+            apsScheduleRestart(null, needScheduleStartDate, lenzhaEndDate, currentUser, null, true, false);
             //退火5天
-            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null, false, true, true);
+            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null, false, true);
         } catch (Exception e) {
             log.error(e);
             return "success";

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,true);
+        apsBlankOrderService.apsScheduleRestart(hour, chongpaiStartDate, chongpaiEndDate, null, blankIds,haveLenZha,haveTuiHuo);
         return R.ok();
     }