Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -34,12 +34,12 @@ public class BaseOrder extends BaseCode {
     @ApiParam(value ="优先级")
     private Integer priority;
 
-    @Column(name="最晚结束时刻")
+    @Column(name="LET")
-    @ApiParam(value ="工作筛选")
+    @ApiParam(value ="最晚结束时刻")
     private Date let;
 
-    @Column(name="最早开始时刻计算值")
+    @Column(name="CALC_EST")
-    @ApiParam(value ="工作筛选")
+    @ApiParam(value ="最早开始时刻计算值")
     private Date calcEst;
 
     @Column(name="CALC_LET")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java

@@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import org.springframework.context.annotation.Bean;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -108,7 +107,7 @@ public class Operation extends BaseAPS {
     }
 
     @JsonBackReference
-    public List<Resource> getOperResources() {
+    public List<OperResource> getOperResources() {
         return BeanRelation.list(this, EOperation.OperResources);
     }
 
@@ -120,9 +119,4 @@ public class Operation extends BaseAPS {
         this.standOperationId = std != null ? std.getId() : 0l;
         BeanRelation.set(this, EOperation.StandOperation, std);
     }
-
-    @JsonBackReference
-    public List<Work> getWorks() {
-        return BeanRelation.list(this, EOperation.Works);
-    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java

@@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long productOrderId;
 
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
     public BaseOrder getProductOrder() {
         return BeanRelation.get(this, EParentWork.ProductOrder);
     }
@@ -46,6 +51,15 @@ public class ParentWork extends BaseAPS {
         BeanRelation.set(this, EParentWork.ProductOrder, order);
     }
 
+    public Operation getOperation() {
+        return BeanRelation.get(this, EParentWork.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EParentWork.Operation, oper);
+    }
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EParentWork.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -107,6 +107,11 @@ public class Work extends BaseCode {
     @FieldAnnotation(property = false)
     private Long operationId;
 
+    @Column(name="PARENT_WORK_ID")
+    @ApiParam(value ="父工作")
+    @FieldAnnotation(property = false)
+    private Long parentWorkId;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }
@@ -116,6 +121,24 @@ public class Work extends BaseCode {
         BeanRelation.set(this, EWork.Order, order);
     }
 
+    public Operation getOperation() {
+        return BeanRelation.get(this, EWork.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EWork.Operation, oper);
+    }
+
+    public ParentWork getParentWork() {
+        return BeanRelation.get(this, EWork.ParentWork);
+    }
+
+    public void setParentWork(ParentWork parentWork) {
+        this.parentWorkId = parentWork != null ? parentWork.getId() : 0l;
+        BeanRelation.set(this, EWork.ParentWork, parentWork);
+    }
+
     @JsonBackReference
     public List<WorkResource> getWorkResources() {
         return BeanRelation.list(this, EWork.WorkResources);
@@ -141,15 +164,6 @@ public class Work extends BaseCode {
         return BeanRelation.list(this, EWork.WorkRelationOutputs);
     }
 
-    public Operation getOperation() {
-        return BeanRelation.get(this, EWork.Operation);
-    }
-
-    public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
-        BeanRelation.set(this, EWork.Operation, oper);
-    }
-
     @JsonBackReference
     public List<PlanFeedback> getPlanFeedbacks() {
         return BeanRelation.list(this, EWork.PlanFeedbacks);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java

@@ -5,6 +5,5 @@ public enum EOperation {
     OperInputs,
     OperOutputs,
     OperResources,
-    StandOperation,
+    StandOperation
-    Works
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java

@@ -2,5 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EParentWork {
     ProductOrder,
+    Operation,
     Works
 }

modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="ParentWork">
+    <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
+    </Relation>
     <Relation field="Works" name="Work" reverse="ParentWork" type="ONE_TO_MULTI" owner="true">
     </Relation>
 </Class>

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -10,7 +10,7 @@
     </Relation>
     <Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
     </Relation>
-    <Relation field="Operation" name="Operation" reverse="Works" type="MULTI_TO_ONE" owner="false">
+    <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
     </Relation>
     <Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
     </Relation>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -3351,7 +3351,10 @@ public class WmsEnumUtil {
     public enum INVENTORY_DIFFERENCE_TYPE {
         INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
         INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
-        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
+        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
+        INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
+        INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
+        INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
 
         private int value;
         private String code;
@@ -3642,7 +3645,7 @@ public class WmsEnumUtil {
         CREATE_TASK(10, "CREATE_TASK", "生成任务"),
         AUTO_OPT(20, "AUTO_OPT", "自动操作"),
     	MENU_OPT(30, "MENU_OPT", "手工操作"),
-    	AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易");
+    	AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
         private int value;
         private String code;
         private String description;