排程数据组装优化

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

@@ -853,6 +853,7 @@ public class ApsServiceImpl implements ApsService {
                         ep.setEquipmentWidth(checkItemsD.getEquipmentlength());
                         ep.setEquipmentBearing(checkItemsD.getEquipmentbearing());
                         ep.setFurnace(apsScheduleConfig.getFurnace());
+                        ep.setMaxfurance(checkItemsD.getMaxfurance());
                         equipment.setEquipmentParameter(ep);
                         // 查询设备锁定的已排程的时间段
                         List<ApsProcessOperationProcessEquDo> processEqus = null;
@@ -1144,6 +1145,24 @@ public class ApsServiceImpl implements ApsService {
                         processes.setMinThPcNum(processDetail.getPlanprocessrall());
                         processes.setProducePcNum(preprocess.getPlanprocessrall());
                     }
+                    if(apsBlankOrderVo.getPlanhavematerialdate() != null){
+                        // 全局配置
+                        ApsOverallConfig apsOverallConfig = new ApsOverallConfig();
+                        Date startDate = apsBlankOrderVo.getPlanhavematerialdate();
+                        LocalDateTime startTime = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                        apsOverallConfig.setStartTimeLong(startDate.getTime());
+                        apsOverallConfig.setStartTime(startTime);
+                        // 排程全局配置
+                        apsOverallConfig.setRoamTime(productionScheduleVo.getRoamTime());
+                        apsOverallConfig.setWashingtime(productionScheduleVo.getWashingtime());
+                        apsOverallConfig.setStandingtime(productionScheduleVo.getStandingtime());
+                        apsOverallConfig.setClosealloynames(productionScheduleVo.getClosealloynames());
+                        apsOverallConfig.setFurnaceInstallations(productionScheduleVo.getFurnaceInstallations());
+                        apsOverallConfig.setMergeFurnaces(productionScheduleVo.getMergeFurnaces());
+                        apsOverallConfig.setLooseness(productionScheduleVo.getLooseness());
+                        apsOverallConfig.setStandingyield(productionScheduleVo.getStandingyield());
+                        processes.setApsOverallConfig(apsOverallConfig);
+                    }
                     operationProcess.add(processes);
                 }
             }else{

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/AspCheckItemsDo.java

@@ -376,5 +376,17 @@ public class AspCheckItemsDo extends BaseDo {
     @TableField("EQUASSOCIATED")
     private String equassociated;
 
+    /**
+     * 提醒状态
+     */
+    @TableField("REMINDERSTATE")
+    private String reminderstate;
+
+    /**
+     * 最大装炉卷数
+     */
+    @TableField("MAXFURANCE")
+    private Integer maxfurance;
+
 
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/EquipmentParameter.java

@@ -16,5 +16,7 @@ public class EquipmentParameter {
     private BigDecimal equipmentBearing;
     // 设备宽度
     private BigDecimal furnace;
+    // 最大装炉卷数
+    private Integer maxfurance;
 
 }