Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EShippingTime;
@@ -33,18 +34,22 @@ public class ShippingTime extends BaseAPS {
 
     @Column(name="PREV_RES_CODE")
     @ApiParam(value ="前资源对象Id")
+    @FieldAnnotation(property = false)
     private Long prevResId;
 
     @Column(name="POST_RES_CODE")
     @ApiParam(value ="后资源对象Id")
+    @FieldAnnotation(property = false)
     private Long postResId;
 
     @Column(name="PREV_STAND_CODE")
     @ApiParam(value ="前标准工序对象Id")
+    @FieldAnnotation(property = false)
     private Long prevStandId;
 
     @Column(name="POST_STAND_CODE")
     @ApiParam(value ="后标准工序对象Id")
+    @FieldAnnotation(property = false)
     private Long postStandId;
 
     public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); }

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

@@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS {
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
     @FieldAnnotation(modify = false)
-    @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin")
+    @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
     private Date lockBegin;
 
     @Column(name="LOCK_END")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java

@@ -67,6 +67,10 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "子零件数量", example = "0")
     private Double qty;
 
+    @Transient
+    @ApiParam(value = "绑定数量")
+    private Double boundQty;
+
     @Column(name = "IS_REPEAT")
     @ApiParam(value = "是否可重复")
     private Integer isRepeat;
@@ -99,6 +103,9 @@ public class MesProcessBom extends BaseBean {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    public double getBoundQtyVal() {
+        return this.boundQty == null ? 0.0d : this.boundQty;
+    }
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :产品绑定记录表
@@ -70,11 +71,11 @@ public class MesProdBindRecord extends BaseBean {
     private String supplierCode;
 
     @Column(name = "LOT_NO")
-    @ApiParam
+    @ApiParam("关联批次")
     private String lotNo;
 
     @Column(name = "IS_FEED")
-    @ApiParam
+    @ApiParam("是否投料配置")
     private Integer isFeed;
 
     @Column(name = "VERSION")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java

@@ -58,4 +58,18 @@ public class MesProcessBomModel {
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
     }
+
+    public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) {
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.qty = qty;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.organizeCode = organizeCode;
+        this.isFeed = isFeed;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.parentPartNo = parentPartNo;
+        this.parentPartName = parentPartName;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java

@@ -50,11 +50,10 @@ public class MesProdBindRecordModel {
 
     }
 
-    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
+    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
-        this.qty = qty;
         this.isValid = isValid;
         this.isDeleted = isDeleted;
         this.organizeCode = organizeCode;
@@ -104,4 +103,17 @@ public class MesProdBindRecordModel {
         this.serialNumber = serialNumber;
     }
 
+    public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
+        this.itemPartNo = itemPartNo;
+        this.qty = qty;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.organizeCode = organizeCode;
+        this.isFeed = isFeed;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.kpSn = kpSn;
+        this.parentPartNo = parentPartNo;
+        this.serialNumber = serialNumber;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java

@@ -70,6 +70,10 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "子零件数量", example = "0")
     private Double qty;
     
+    @Transient
+    @ApiParam(value = "绑定数量")
+    private Double boundQty;
+
     @Column(name = "IS_REPEAT")
     @ApiParam(value = "是否可重复")
     private Integer isRepeat;