历史排程设备记录

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

@@ -1806,6 +1806,8 @@ public class ApsServiceImpl implements ApsService {
                         // 已排程的作业明细数据保持ID不变
                         if (processEquDos != null && i < processEquDos.size()) {
                             processes.setId(processEquDos.get(i).getId());
+                            // 历史排程设备记录
+                            processes.setLastHistoryEquipmentId(processEquDos.get(i).getProcessdeviceid());
                             // 锁定作业的关联关系设置
                             if (StrUtil.isNotBlank(processEquDos.get(i).getPreviousprocessesids())) {
                                 processes.setPreviousProcessesIds(new ArrayList<>(Arrays.asList(processEquDos.get(i).getPreviousprocessesids().split(","))));
@@ -1885,6 +1887,8 @@ public class ApsServiceImpl implements ApsService {
                         // 已排程的作业明细数据保持ID不变
                         if (processEquDos != null && i < processEquDos.size()) {
                             processes.setId(processEquDos.get(i).getId());
+                            // 历史排程设备记录
+                            processes.setLastHistoryEquipmentId(processEquDos.get(i).getProcessdeviceid());
                             // 锁定作业的关联关系设置
                             if (StrUtil.isNotBlank(processEquDos.get(i).getPreviousprocessesids())) {
                                 processes.setPreviousProcessesIds(new ArrayList<>(Arrays.asList(processEquDos.get(i).getPreviousprocessesids().split(","))));
@@ -1944,6 +1948,8 @@ public class ApsServiceImpl implements ApsService {
                         // 已排程的作业明细数据保持ID不变
                         if (processEquDos != null && i < processEquDos.size()) {
                             processes.setId(processEquDos.get(i).getId());
+                            // 历史排程设备记录
+                            processes.setLastHistoryEquipmentId(processEquDos.get(i).getProcessdeviceid());
                             // 锁定作业的关联关系设置
                             if (StrUtil.isNotBlank(processEquDos.get(i).getPreviousprocessesids())) {
                                 processes.setPreviousProcessesIds(new ArrayList<>(Arrays.asList(processEquDos.get(i).getPreviousprocessesids().split(","))));

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

@@ -50,6 +50,11 @@ public class ProductionProcesses{
      */
     private String equipmentId;
 
+    /**
+     * 工步生产时的设备
+     */
+    private String lastHistoryEquipmentId;
+
     /**
      * 工步生产时的设备
      */
@@ -636,4 +641,12 @@ public class ProductionProcesses{
     public void setOptionalEquipmentZg(Map<String, String> optionalEquipmentZg) {
         this.optionalEquipmentZg = optionalEquipmentZg;
     }
+
+    public String getLastHistoryEquipmentId() {
+        return lastHistoryEquipmentId;
+    }
+
+    public void setLastHistoryEquipmentId(String lastHistoryEquipmentId) {
+        this.lastHistoryEquipmentId = lastHistoryEquipmentId;
+    }
 }