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

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

@@ -1,6 +1,9 @@
 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;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -21,27 +24,59 @@ import javax.persistence.Table;
 @Table(name = "APS_SHIPPING_TIME")
 @Api("运输时间")
 public class ShippingTime extends BaseAPS {
+    @Column(name="TIME")
+    @ApiParam(value ="运输时间")
+    private String time;
+
+    @Column(name="PRIORITY")
+    @ApiParam(value ="优先级")
+    private Integer priority;
+
     @Column(name="PREV_RES_CODE")
-    @ApiParam(value ="前资源编码")
+    @ApiParam(value ="前资源对象Id")
-    private String prevResCode;
+    @FieldAnnotation(property = false)
+    private Long prevResId;
 
     @Column(name="POST_RES_CODE")
-    @ApiParam(value ="后资源编码")
+    @ApiParam(value ="后资源对象Id")
-    private String postResCode;
+    @FieldAnnotation(property = false)
+    private Long postResId;
 
     @Column(name="PREV_STAND_CODE")
-    @ApiParam(value ="前标准工序编码")
+    @ApiParam(value ="前标准工序对象Id")
-    private String prevStandCode;
+    @FieldAnnotation(property = false)
+    private Long prevStandId;
 
     @Column(name="POST_STAND_CODE")
-    @ApiParam(value ="后标准工序编码")
+    @ApiParam(value ="后标准工序对象Id")
-    private String postStandCode;
+    @FieldAnnotation(property = false)
+    private Long postStandId;
 
-    @Column(name="TIME")
+    public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); }
-    @ApiParam(value ="运输时间")
-    private String time;
 
-    @Column(name="PRIORITY")
+    public  void setPrevRes(Resource res) {
-    @ApiParam(value ="优先级")
+        this.prevResId = res != null ? res.getId() : 0l;
-    private Integer priority;
+        BeanRelation.set(this, EShippingTime.PrevRes, res);
+    }
+
+    public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); }
+
+    public void setPostRes(Resource res) {
+        this.postResId = res != null ? res.getId() : 0l;
+        BeanRelation.set(this, EShippingTime.PostRes, res);
+    }
+
+    public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);}
+
+    public void setPrevStand(StandOperation stand) {
+        this.prevStandId = stand != null ? stand.getId() : 0l;
+        BeanRelation.set(this, EShippingTime.PrevStand, stand);
+    }
+
+    public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); }
+
+    public void setPostStand(StandOperation stand) {
+        this.postStandId = stand != null ? stand.getId() : 0l;
+        BeanRelation.set(this, EShippingTime.PostStand, stand);
+    }
 }

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-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -202,30 +202,26 @@ public class BeanRelation {
         }
     }
 
-    public static <T extends BaseBean> List<T> lastList(BaseBean entity, Enum<?>... args) {
+    public static <T extends BaseBean> List<T> lastList(BaseBean bean, Enum<?>... holders) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
-        lastListImpl(result, entity, null, args, 0);
+        lastListImpl(result, bean, bean, holders, 0);
-        return result;
-    }
-
-    public static <T extends BaseBean> List<T> lastList(BaseBean entity, Predicate<T> filter, Enum<?>... args) {
-        List<T> result = new ArrayList<T>();
-        lastListImpl(result, entity, filter, args, 0);
         return result;
     }
-
+    private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self,
-    @SuppressWarnings("unchecked")
+                                                                   Enum<?>[] holders, int index) {
-    private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean entity, Predicate<T> filter,
+        if (index >= holders.length) {
-                                                                   Enum<?>[] args, int index) {
+            if (self == bean) {
-        if (index >= args.length) {
+                return false;
+            }
             index = 0;
+            self = bean;
         }
 
         boolean bNotLast = true;
-        List<BaseBean> relaEntities = list(entity, args[index]);
+        List<BaseBean> nextBeans = list(bean, holders[index]);
-        for (BaseBean relaEntity : relaEntities) {
+        for (BaseBean nextBean : nextBeans) {
-            if (lastListImpl(result, relaEntity, filter, args, index + 1)) {
+            if (lastListImpl(result, nextBean, self, holders, index + 1)) {
-                result.add((T)relaEntity);
+                result.add((T)nextBean);
                 bNotLast = false;
             }
         }

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

@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EShippingTime {
+    PrevRes,    // 前资源
+    PostRes,    // 后资源
+    PrevStand,  // 前标准工序
+    PostStand   // 后标准工序
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.model;
 
 import cn.estsh.i3plus.pojo.aps.bean.WorkResource;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -14,5 +15,5 @@ import java.util.List;
  **/
 public class ResourceCompose {
     public WorkResource resource;
-    public List<WorkResource> assResource;
+    public List<WorkResource> assResource = new ArrayList<>();
 }

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="WorkPlan">
+    <Relation field="PrevRes" name="Resource" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="PostRes" name="Resource" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="PrevStand" name="StandOperation" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="PostStand" name="StandOperation" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>

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

@@ -67,8 +67,12 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "子零件数量", example = "0")
     private Double qty;
 
+    @Transient
+    @ApiParam(value = "绑定数量")
+    private Double boundQty;
+
     @Column(name = "IS_REPEAT")
-        @ApiParam(value = "是否可重复")
+    @ApiParam(value = "是否可重复")
     private Integer isRepeat;
 
     @Column(name = "IS_CHECK")
@@ -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/bean/MesProduceCtgyPicture.java

@@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCtgyCode;
+    private String produceCategoryCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")

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;