存在未锁定作业的坯料计划参与排程，锁定的作业设备时间固定不变

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

@@ -175,6 +175,11 @@ public class ProductionProcesses{
      */
     private boolean ifLock;
 
+    /**
+     * 是否合并工序
+     */
+    private boolean mergeProcesses;
+
     public String getEquipmentType() {
         return equipmentType;
     }
@@ -433,4 +438,12 @@ public class ProductionProcesses{
     public void setIfLock(boolean ifLock) {
         this.ifLock = ifLock;
     }
+
+    public boolean isMergeProcesses() {
+        return mergeProcesses;
+    }
+
+    public void setMergeProcesses(boolean mergeProcesses) {
+        this.mergeProcesses = mergeProcesses;
+    }
 }