aps-调度排程冷轧修改

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/fegin/RwApsServer.java

@@ -16,4 +16,7 @@ public interface RwApsServer {
     @PostMapping("/apsSchedule/productionThSchedule")
     ProductionScheduleRetVo productionThSchedule(@RequestBody ProductionScheduleVo productionScheduleVo);
 
+    @PostMapping("/apsSchedule/productionLzDdSchedule")
+    ProductionScheduleRetVo productionLzDdSchedule(@RequestBody ProductionScheduleVo productionScheduleVo);
+
 }

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

@@ -4416,9 +4416,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
 
             //推算非退火、非铸轧的重叠数据，按序排列
-            sortLenZha(chongpaiEndDate, tenantId);
+            sortLenZha(chongpaiStartDate, tenantId);
             //推算退火，按序排列
-            sortTuiHuo(chongpaiEndDate, tenantId);
+            sortTuiHuo(chongpaiStartDate, tenantId);
 
         }
     }

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

@@ -783,7 +783,12 @@ public class ApsServiceImpl implements ApsService {
             System.out.println("排程数据：" + JSONUtil.toJsonStr(apsProductionSchedule, jsonConfig));
             logger.info("排程数据：" + JSONUtil.toJsonStr(apsProductionSchedule, jsonConfig));
             // APS平台排程接口调用
-            ProductionScheduleRetVo productionScheduleRetVo = rwApsServer.productionSchedule(apsProductionSchedule);
+            ProductionScheduleRetVo productionScheduleRetVo;
+            if (apsType.getConstraintMode() != null && apsType.getConstraintMode().equals("lz")) {
+                productionScheduleRetVo = rwApsServer.productionLzDdSchedule(apsProductionSchedule);
+            } else {
+                productionScheduleRetVo = rwApsServer.productionSchedule(apsProductionSchedule);
+            }
             logger.info("排程结果：" + JSONUtil.toJsonStr(productionScheduleRetVo, jsonConfig));
             //排程结束时间
             DateTime endTime = DateUtil.date();