Merge remote-tracking branch 'origin/mode-th-merge-01' into mode-th-merge-01

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/domain/ProductionProcesses.java

@@ -101,6 +101,11 @@ public class ProductionProcesses implements Serializable {
      */
     private List<Equipment> optionalProviderEquipments;
 
+    /**
+     * 工步生产时的设备
+     */
+    private String lastHistoryEquipmentId;
+
     /**
      * 铸轧机按熔炉分组设备集合
      */
@@ -1190,6 +1195,14 @@ public class ProductionProcesses implements Serializable {
         this.roottaskid = roottaskid;
     }
 
+    public String getLastHistoryEquipmentId() {
+        return lastHistoryEquipmentId;
+    }
+
+    public void setLastHistoryEquipmentId(String lastHistoryEquipmentId) {
+        this.lastHistoryEquipmentId = lastHistoryEquipmentId;
+    }
+
     public String getSeriSort(){
         String sortStr = this.getId();
         if(this.getStartTime() != null){