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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -801,8 +801,9 @@ public class WmsEnumUtil {
         VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"),
         VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
         VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
-        VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错");
+        VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
-
+        VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
+        VDA_SN_("VDA_SN_MERGE", "VDA条码合并");
         private String value;
         private String description;
 
@@ -2763,8 +2764,47 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
+
+    public enum WMS_PART_TYPE_STR {
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
+
+        private String value;
+        private String description;
+
+        WMS_PART_TYPE_STR(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
     /**
      * 任务数据来源：检查子数据
      */
@@ -2918,6 +2958,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -44,6 +46,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
     @Column(name = "PART_TYPE_DESC")
@@ -169,8 +172,13 @@ public class WmsPart extends BaseBean {
 
     @Transient
     @ApiParam("库存水平")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
     private String stockLevelStatus;
 
+    @Column(name="verb_num")
+    @ApiParam(value = "单次拆包数")
+    private Double verbNum;
+
     @Column(name = "IS_PROD_LOT")
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java

@@ -83,6 +83,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "线路代码")
     private String routingCode;
 
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam(value = "目的库位")
+    private String destLocateNo;
+
     public WmsRoutingRule(){}
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+@Data
+@Api("库存预警入参")
+public class QuanWarnDto extends Pager {
+
+    private String organizeCode;
+    private Integer checked;
+    private String partNo;
+    private String partType;
+
+    public Integer getChecked() {
+        return checked == null? 0 : checked;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 移动单统计输出model
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-10-31 20:04
+ * @Modify:
+ **/
+@Data
+@Api("移动单统计输出model")
+public class WmsMoveInfoModel {
+
+
+    @ApiParam(value = "操作时间")
+    private String modifyDateTime;
+    @ApiParam(value = "物料号")
+    private String partNo;
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+    @ApiParam(value = "交易类型")
+    private String transTypeCode;
+    @ApiParam(value = "交易类型名称")
+    private String transTypeName;
+    @ApiParam(value = "业务类型")
+    private String busiTypeCode;
+    @ApiParam(value = "处理数量")
+    private String sumQty;
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+    @ApiParam(value = "操作状态")
+    private String itemStatus;
+    public WmsMoveInfoModel() {
+    }
+
+    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) {
+        this.modifyDateTime = modifyDateTime;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.busiTypeCode = busiTypeCode;
+        this.sumQty = sumQty;
+        this.organizeCode = organizeCode;
+    }
+}