连续生产约束功能扩展

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

@@ -757,6 +757,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                     equipment.setWorkshopname(checkItemsD.getUsedeptname());
                                     equipment.setFactoryid(checkItemsD.getTenantid());
                                     equipment.setFactory(checkItemsD.getOwnedfactory());
+                                    equipment.setEquassociated(checkItemsD.getEquassociated());
                                     // 查询设备锁定的已排程的时间段
                                     List<ApsProcessOperationProcessEquDo> processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                                             .eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, equIds)
@@ -952,6 +953,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         if (operationDo.getMaxflowwaitmin() != null) {
                             processes.setMaxWaitTime(operationDo.getMaxflowwaitmin().intValue());
                         }
+                        // 合金
+                        processes.setVolumeMetal(operationDo.getMetal());
                         // 上道工序
                         if (StringUtils.isNotBlank(operationDo.getPreviousprocessid())) {
                             processes.setPreviousProcessesIds(Arrays.asList(operationDo.getPreviousprocessid().split(",")));
@@ -977,13 +980,15 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         if(LOCKMARK_Y.equals(operationDo.getLockmark())){
                             ApsProcessOperationProcessEquDo processEquServiceOne = processOperationProcessEquService.getOne(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                                     .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()));
-                            processes.setIfLock(true);
-                            processes.setEquipmentId(processEquServiceOne.getProcessdeviceid());
-                            List<String> opeqs = new ArrayList<>();
-                            opeqs.add(processEquServiceOne.getProcessdeviceid());
-                            processes.setOptionalEquipments(opeqs);
-                            processes.setStartTime(processEquServiceOne.getPlanstartdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-                            processes.setEndTime(processEquServiceOne.getPlanenddate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                            if(processEquServiceOne != null){
+                                processes.setIfLock(true);
+                                processes.setEquipmentId(processEquServiceOne.getProcessdeviceid());
+                                List<String> opeqs = new ArrayList<>();
+                                opeqs.add(processEquServiceOne.getProcessdeviceid());
+                                processes.setOptionalEquipments(opeqs);
+                                processes.setStartTime(processEquServiceOne.getPlanstartdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                                processes.setEndTime(processEquServiceOne.getPlanenddate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                            }
                         }
                         processesList.add(processes);
                     }

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

@@ -370,5 +370,11 @@ public class AspCheckItemsDo extends BaseDo {
     @TableField("BEARINGUNIT")
     private String bearingunit;
 
+    /**
+     * 关联设备
+     */
+    @TableField("EQUASSOCIATED")
+    private String equassociated;
+
 
 }

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

@@ -87,6 +87,11 @@ public class Equipment{
      */
     private Integer lastProcessCutfinishmin;
 
+    /**
+     * 关联设备，铸轧机关联的熔炼炉
+     */
+    private String equassociated;
+
     /**
      * 设备运行时间段
      */

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

@@ -180,6 +180,11 @@ public class ProductionProcesses{
      */
     private boolean mergeProcesses;
 
+    /**
+     * 合金
+     */
+    private String volumeMetal;
+
     public String getEquipmentType() {
         return equipmentType;
     }
@@ -446,4 +451,12 @@ public class ProductionProcesses{
     public void setMergeProcesses(boolean mergeProcesses) {
         this.mergeProcesses = mergeProcesses;
     }
+
+    public String getVolumeMetal() {
+        return volumeMetal;
+    }
+
+    public void setVolumeMetal(String volumeMetal) {
+        this.volumeMetal = volumeMetal;
+    }
 }