fangpy 7 mesi fa
parent
commit
beb24f0dbd

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

@@ -79,6 +79,8 @@ public class ApsServiceImpl implements ApsService {
     private ApsAnnealingDifferenceService apsAnnealingDifferenceService;
     @Autowired
     private ApsNochangeRollerService apsNochangeRollerService;
+    @Autowired
+    private ApsProductionProcessesService apsProductionProcessesService;
 
     /**
      * Aps排程
@@ -545,6 +547,15 @@ public class ApsServiceImpl implements ApsService {
                     }
                 }
             }
+            List<ApsProductionProcessesDo> productionProcessesDos = apsProductionProcessesService.list();
+            Map<String,String> productionProcessesDosMap = new HashMap<>();
+            for (ApsProductionProcessesDo productionProcessesDo : productionProcessesDos) {
+                productionProcessesDosMap.put(productionProcessesDo.getProductprocessname(),productionProcessesDo.getProcesscategory());
+            }
+            for (ProductionProcesses process : processes) {
+                process.setProcessCategory(productionProcessesDosMap.get(process.getProcessType()));
+            }
+
             apsProductionSchedule.setProcesses(processes);
             apsProductionSchedule.setEquipmentList(equipmentList);