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

 Conflicts:

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

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

@@ -6612,6 +6612,51 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * BatchHold 物料检测标准值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_PART_CHECK_STD {
+        NUMBER(1, "NORMAL", "合格"),
+        TEXT(2, "ABNORMAL", "不合格");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_PART_CHECK_STD(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
 
     /**
      * BH检测结果类型 RepairOrPick

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

@@ -59,6 +59,7 @@ public class WmsActionModule extends BaseBean {
     @AnnoOutputColumn
     public Integer isShowInfo;
 
+    @Column(name = "OP_TYPE_NAME", columnDefinition = "varchar(225) default ''")
     @ApiParam(value = "作业类型名称")
     public String opTypeName;
 

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

@@ -62,7 +62,7 @@ public class WmsPartItemCheck extends BaseBean {
 
     @Column(name = "STANDARD")
     @ApiParam("标准值")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD")
     private Integer standard;
 
     @Column(name = "MAX")

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * @Description : 报工事务明细表model
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("报工事务明细表model")
+public class WmsReportTransDetailModel extends BaseBean {
+    @ApiParam(value = "报工产线")
+    private String lineNo;
+
+    @ApiParam(value = "实际报工产线")
+    private String reportLine;
+
+    @ApiParam(value = "班组名称")
+    private String shiftNo;
+
+    @ApiParam(value = "班组描述")
+    private String shiftName;
+
+    @ApiParam(value = "报工库区")
+    private String zoneNo;
+
+    @ApiParam(value = "报工库位")
+    private String locateNo;
+
+    @ApiParam(value = "报工条码")
+    private String reportSn;
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "客户代码")
+    private String custNo;
+
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @ApiParam(value = "数量")
+    private Double qty;
+
+    @ApiParam(value = "包规")
+    private String dateCode;
+
+    @ApiParam(value = "供应商批次")
+    private Double snp;
+
+    @ApiParam(value = "收货批次")
+    private String lotNo;
+
+    // , String createUser, String createDateTime
+    public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName,
+                                     String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo,
+                                     String unit, Double qty, String dateCode, Double snp, String lotNo) {
+        this.organizeCode = organizeCode;
+        this.lineNo = lineNo;
+        this.reportLine = actualReportLine;
+        this.shiftNo = shiftNo;
+        this.shiftName = shiftName;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.reportSn = sn;
+        this.partNo = partNo;
+        this.partName = partNameRdd;
+        this.custNo = custNo;
+        this.unit = unit;
+        this.qty = qty;
+        this.dateCode = dateCode;
+        this.snp = snp;
+        this.lotNo = lotNo;
+    }
+
+    public WmsReportTransDetailModel() {
+
+    }
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * @Description : 报工事务汇总表model
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("报工事务汇总表model")
+public class WmsReportTransMasterModel extends BaseBean {
+    @ApiParam(value = "实体线")
+    private String lineNo;
+
+    @ApiParam(value = "班组名称")
+    private String shiftNo;
+
+    @ApiParam(value = "班组描述")
+    private String shiftName;
+
+    @ApiParam(value = "报工库区")
+    private String zoneNo;
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "报工数量")
+    private Double qty;
+
+    public WmsReportTransMasterModel(String organizeCode, String lineNo, String shiftNo, String shiftName,
+                                     String zoneNo, String partNo, String partNameRdd, Double qty) {
+        this.organizeCode = organizeCode;
+        this.lineNo = lineNo;
+        this.shiftNo = shiftNo;
+        this.shiftName = shiftName;
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partName = partNameRdd;
+        this.qty = qty;
+    }
+
+    public WmsReportTransMasterModel() {
+
+    }
+}

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

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * @Description : 供应商延迟到货明细表model
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("供应商延迟到货明细表model")
+public class WmsVendorDelayDetailModel extends BaseBean {
+
+    @ApiParam(value = "单据编号")
+    private String orderNo;
+
+    @ApiParam(value = "完成状态")
+    private Integer itemStatus;
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "总数量")
+    private Double qty;
+
+    @ApiParam(value = "预交日期")
+    private String planDate;
+
+    @ApiParam(value = "预交时间")
+    private String planTime;
+
+    @ApiParam(value = "收货日期")
+    private String recDate;
+
+    @ApiParam(value = "收货时间")
+    private String recTime;
+
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty,
+                                     String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.qty = qty;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.recDate = recDate;
+        this.recTime = recTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        setOrganizeCode(organizeCode);
+    }
+
+    public WmsVendorDelayDetailModel() {
+
+    }
+}

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+/**
+ * @Description : 供应商延迟到货汇总表model
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@Api("供应商延迟到货汇总表model")
+public class WmsVendorDelayMasterModel extends BaseBean {
+
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "延迟次数")
+    private Long delayCount;
+
+    public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) {
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.delayCount = count;
+        setOrganizeCode(organizeCode);
+    }
+
+    public WmsVendorDelayMasterModel() {
+
+    }
+}