APS平台新模型调优

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

@@ -184,7 +184,7 @@ public class ProductionProcesses extends Step{
     /**
      * 是否锁定，锁定的工序开始时间、结束时间需要初始化，参与排程但开始时间、结束时间、以及设备占用不会变化
      */
-    private Boolean ifLock;
+    private boolean ifLock;
 
     /**
      * 单卷宽度
@@ -273,7 +273,7 @@ public class ProductionProcesses extends Step{
     }
 
     public void setEquipment(Equipment equipment) {
-        if(this.ifLock == null || !this.ifLock){
+        if(!this.ifLock){
             this.equipment = equipment;
             if(equipment != null){
                 this.equipmentId = equipment.getId();
@@ -298,7 +298,7 @@ public class ProductionProcesses extends Step{
     }
 
     public void setStartTime(LocalDateTime startTime) {
-        if(this.ifLock == null || !this.ifLock){
+        if(!this.ifLock){
             this.startTime = startTime;
             if(startTime != null){
                 this.endTime = startTime.plusMinutes(produceTime);
@@ -547,11 +547,11 @@ public class ProductionProcesses extends Step{
         this.conflictDes = conflictDes;
     }
 
-    public Boolean getIfLock() {
+    public boolean getIfLock() {
         return ifLock;
     }
 
-    public void setIfLock(Boolean ifLock) {
+    public void setIfLock(boolean ifLock) {
         this.ifLock = ifLock;
     }
 }