排程数据组装bug修改

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

@@ -127,7 +127,7 @@ public class ApsServiceImpl implements ApsService {
                         // 合金
                         if(alloy1.compareTo(alloy2) == 0){
                             // 合金状态
-                            if(alloystatus1.compareTo(alloystatus2) == 0){
+                            if(alloystatus1 == null || alloystatus2 == null || alloystatus1.compareTo(alloystatus2) == 0){
                                 // 产品类型
                                 if(producttype1.compareTo(producttype2) == 0){
                                     // 厚度
@@ -237,6 +237,9 @@ public class ApsServiceImpl implements ApsService {
         } else {
             throw new CustomException("排程参数缺失");
         }
+        // 全局配置
+
+
         // 洗炉合金配置数据设置
         List<WashingMetal> washingMetalConfig = apsBlankOrderDao.getWashingMetalConfig();
         productionScheduleVo.setClosealloynames(washingMetalConfig);
@@ -536,17 +539,16 @@ public class ApsServiceImpl implements ApsService {
                 List<ApsProcessOperationProcessEquDo> processDetails = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                         .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()));
                 for (ApsProcessOperationProcessEquDo processDetail : processDetails) {
-                    // 锁定的作业加上锁定标识
-                    if (LOCKMARK_Y.equals(operationDo.getLockmark())) {
-                        ProductionProcesses processes = productionProcessesDetailInit(operationDo, produceOrder, optionalEquipments,outMaterDos);
-                        processes.setIfLock(true);
-                        processes.setEquipmentId(processDetail.getProcessdeviceid());
-                        List<String> opeqs = new ArrayList<>();
-                        opeqs.add(processDetail.getProcessdeviceid());
-                        processes.setOptionalEquipments(opeqs);
-                        processes.setStartTime(processDetail.getPlanstartdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-                        processes.setEndTime(processDetail.getPlanenddate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-                    }
+                    ProductionProcesses processes = productionProcessesDetailInit(operationDo, produceOrder, optionalEquipments,outMaterDos);
+                    processes.setIfLock(true);
+                    processes.setEquipmentId(processDetail.getProcessdeviceid());
+                    List<String> opeqs = new ArrayList<>();
+                    opeqs.add(processDetail.getProcessdeviceid());
+                    processes.setOptionalEquipments(opeqs);
+                    processes.setDelay(0);
+                    processes.setStartTime(processDetail.getPlanstartdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    processes.setEndTime(processDetail.getPlanenddate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    operationProcess.add(processes);
                 }
             }else{
                 for (Integer i = 0; i < operationDo.getPlanprocessrall(); i++) {

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

@@ -131,6 +131,11 @@ public class ProductionProcesses{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
+    /**
+     * 延迟分钟数据（步长5分钟）
+     */
+    private Integer delay;
+
     /**
      * 上一个工步
      */
@@ -509,4 +514,12 @@ public class ProductionProcesses{
     public void setVolumeThickness(BigDecimal volumeThickness) {
         this.volumeThickness = volumeThickness;
     }
+
+    public Integer getDelay() {
+        return delay;
+    }
+
+    public void setDelay(Integer delay) {
+        this.delay = delay;
+    }
 }