Browse Source

排程数据回写优化

fangpy 1 year ago
parent
commit
5984ca31d4

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

@@ -210,7 +210,7 @@ public class ApsServiceImpl implements ApsService {
                     }
                     operationMaps.put(operationDo.getId(),operationDo);
                     // 设备列表初始化
-                    List<String> optionalEquipments = equipmentListInit(operationDo,equipmentList,eqMaps,blankids,productionScheduleVo);
+                    List<String> optionalEquipments = equipmentListInit(operationDo,equipmentList,eqMaps,blankids,productionScheduleVo,apsScheduleConfig);
                     // 工序作业相关数据初始化
                     productionProcessesInit(operationDo,produceOrder,optionalEquipments,processesList,operationProductionProcesses);
                 }
@@ -228,7 +228,7 @@ public class ApsServiceImpl implements ApsService {
     }
 
     private List<String> equipmentListInit(ApsProcessOperationDo operationDo,List<Equipment> equipmentList,Map<String, AspCheckItemsDo> eqMaps
-            ,List<String> blankids,ProductionScheduleVo productionScheduleVo){
+            ,List<String> blankids,ProductionScheduleVo productionScheduleVo,ApsScheduleConfigDo apsScheduleConfig){
         // 设备列表
         List<String> optionalEquipments = new ArrayList<>();
         if (StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())) {
@@ -253,6 +253,7 @@ public class ApsServiceImpl implements ApsService {
                         EquipmentParameter ep = new EquipmentParameter();
                         ep.setEquipmentWidth(checkItemsD.getEquipmentlength());
                         ep.setEquipmentBearing(checkItemsD.getEquipmentbearing());
+                        ep.setFurnace(apsScheduleConfig.getFurnace());
                         equipment.setEquipmentParameter(ep);
                         // 查询设备锁定的已排程的时间段
                         List<ApsProcessOperationProcessEquDo> processEqus = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()

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

@@ -14,5 +14,7 @@ public class EquipmentParameter {
     private BigDecimal equipmentWidth;
     // 设备承重
     private BigDecimal equipmentBearing;
+    // 设备宽度
+    private BigDecimal furnace;
 
 }