Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -143,6 +143,14 @@ public abstract class BaseBean implements Serializable {
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
     //排序方式
     public String orderBy(){
         String result = "";

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -67,6 +67,22 @@ public class DdlPackBean {
         return result;
     }
 
+    /**
+     * 查询指定组织、指定是否有效的数据
+     * @param organizeCode
+     * @param isValid
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
     public static DdlPackBean getDdlPackBean(){
         DdlPackBean result = new DdlPackBean();
 

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

@@ -2214,6 +2214,16 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static FIELD_TYPE codeOf(Integer value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
@@ -2327,7 +2337,7 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = 1;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {
@@ -2393,7 +2403,7 @@ public class CommonEnumUtil {
         }
 
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {

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

@@ -2564,11 +2564,11 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-        INCOMING_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"),
+        INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"),
         FIRST_CHECK(10, "FIRST_CHECK", "首检"),
         ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
         END_CHECK(30, "END_CHECK", "末检"),
-        RC_CHECK(40, "EDELIVERY_CHECK", "发货检验");
+        RC_CHECK(40, "RC_CHECK", "发货检验");
 
         private int value;
         private String code;

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

@@ -538,6 +538,14 @@ public class WmsEnumUtil {
             return code;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -873,7 +881,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -1085,6 +1093,10 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1250,6 +1262,9 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -2816,7 +2831,7 @@ public class WmsEnumUtil {
         // 根据枚举编号获取语言代码
         public static String getCodeByIndex(Integer index) {
             for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
-                if (languageType.getValue() == index.intValue()) {
+                if (languageType.getValue() == index) {
                     return languageType.getDescription();
                 }
             }
@@ -3283,7 +3298,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3325,6 +3340,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -3355,7 +3381,7 @@ public class WmsEnumUtil {
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {
-        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
         Class<Enum> clazz;
         Enum[] enumConstants;
 
@@ -3453,7 +3479,7 @@ public class WmsEnumUtil {
         public static String getDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == code) {
+                if (values()[i].value.equals(code)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3576,8 +3602,7 @@ public class WmsEnumUtil {
     public enum WMS_STOCK_TYPE {
         SOURCE(10, "实物条码"),
         TARGET(20, "虚拟条码"),
-        CUST_SN(30, "客户条码"),
-        FIRST_MIDDLE_LAST(40, "首中末件");
+        CUST_SN(30, "客户条码");
 
         private int value;
         private String description;
@@ -3702,7 +3727,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3742,7 +3767,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3876,7 +3901,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -4802,6 +4827,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -6619,6 +6655,11 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -6629,8 +6670,8 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static int descriptionOfValue(String desc) {
-            return descOf(desc);
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
         }
     }
 
@@ -6676,4 +6717,193 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 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
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_TYPE {
+        PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_TYPE(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);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * BH检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_STATUS {
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_STATUS(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);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2706,7 +2706,12 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPackBean packBean;
+        if(dataAuth.getIsValidVal() == 0) {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        } else {
+            packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
+        }
         if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
             DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
         }

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

@@ -21,6 +21,7 @@ import java.util.List;
 @Api("mes导入结果model")
 public class ExcelImportModel<T> implements Serializable {
 
+    private static final long serialVersionUID = 3075276018074690913L;
     @ApiParam("结果")
     private boolean result;
 

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

@@ -20,6 +20,7 @@ import java.io.Serializable;
 @Api("mes导入异常结果model")
 public class ImportErrorModel implements Serializable {
 
+    private static final long serialVersionUID = 1212013821950324792L;
     @ApiParam("错误的行号")
     private int rowNum;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java

@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Api("导入结果model")
 public class ExcelImportModel implements Serializable {
 
+    private static final long serialVersionUID = 1444427447244864339L;
     @ApiParam("结果")
     private boolean result;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 @Data
 public class WmsCSOrderDetailsModel implements Serializable {
 
+    private static final long serialVersionUID = 1035157716685531017L;
     @ApiParam("工厂代码")
     public String  organizeCode;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Api("WMS列表菜单model")
 public class WmsListElementModel extends BaseBean {
 
+    private static final long serialVersionUID = -4040701771244617270L;
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java

@@ -19,6 +19,7 @@ import java.util.List;
 @Api("WMS列表搜索model")
 public class WmsSearchElementModel extends BaseBean {
 
+    private static final long serialVersionUID = -5429148439603308698L;
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
 

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/WmsDataAuth.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -41,7 +42,8 @@ public class WmsDataAuth extends BaseBean {
         return String.valueOf(dataObj);
     }
 
-    @Column(name = "DATA_OBJ_VALUE")
+    @Lob
+    @Column(name = "DATA_OBJ_VALUE", columnDefinition = "TEXT")
     @ApiParam(value = "数据对象值")
     private String dataObjValue;
 

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

@@ -63,7 +63,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/bean/WmsStockInitialize.java

@@ -2,7 +2,7 @@ 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.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -90,7 +90,7 @@ public class WmsStockInitialize extends BaseBean {
     @Column(name = "QC_STATUS")
     @ApiParam(value = "质检状态", example = "0")
     @ColumnDefault("10")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description", required = false)
     private Integer qcStatus;
 
     /**
@@ -99,7 +99,7 @@ public class WmsStockInitialize extends BaseBean {
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")
     @ColumnDefault("30")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description", required = false)
     private Integer snStatus;
 
     @Column(name = "USE_COUNT", nullable = true)

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

@@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -212,6 +216,7 @@ public class WmsStockSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WMS_STOCK_TYPE")
     private Integer snType = 10;
 
+    @Column(name = "USE_COUNT")
     @ApiParam(value = "领用次数", example = "0")
     @ColumnDefault("0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)

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

@@ -65,6 +65,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Column(name = "REWORK_RESULT")
     @ApiParam("返修结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
     public Integer reworkResult;
 
     @Column(name = "PICK_STATUS")
@@ -74,6 +75,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Column(name = "PICK_RESULT")
     @ApiParam("挑选结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
     public Integer pickResult;
 
 }

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

@@ -0,0 +1,99 @@
+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 {
+    private static final long serialVersionUID = 1547988564672291041L;
+    @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;
+
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
+    // , 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, String createDateTime) {
+        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;
+        this.createDatetime = createDateTime;
+    }
+
+    public WmsReportTransDetailModel() {
+
+    }
+}

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

@@ -0,0 +1,58 @@
+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 {
+    private static final long serialVersionUID = 5696795930973637987L;
+    @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,82 @@
+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 {
+
+    private static final long serialVersionUID = -1030326082916174340L;
+    @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;
+
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
+    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, String createDateTime) {
+        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;
+        this.organizeCode = organizeCode;
+        this.createDatetime = createDateTime;
+    }
+
+    public WmsVendorDelayDetailModel() {
+
+    }
+}

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

@@ -0,0 +1,49 @@
+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 {
+
+    private static final long serialVersionUID = 1589775350017343999L;
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "延迟次数")
+    private Long delayCount;
+
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
+    public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.delayCount = count;
+        this.organizeCode = organizeCode;
+        this.createDatetime = createDateTime;
+    }
+
+    public WmsVendorDelayMasterModel() {
+
+    }
+}