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/model/GanttCalendarModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GanttCalendarModel {
+    @Data
+    public static class Block {
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date beginTime;
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date endTime;
+        private Boolean onDuty;
+    }
+    private Long resourceId;
+    private List<Block> timeBlocks = new ArrayList<>();
+}

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

@@ -12,6 +12,197 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+
+    /**
+     * Mes  客户订单来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        SAP("SAP", "来源于SAP");
+
+        private String value;
+        private String description;
+
+        CUST_ORDER_SOURCE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesCustOrder 订单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_TYPE {
+
+        STANDARD(10, "标准");
+
+        private int value;
+        private String description;
+
+        CUST_ORDER_TYPE(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * MesCustOrder实体对应的status值   状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_STATUS {
+
+        CREATE(10, "CREATED", "创建"),
+        DEAL(20, "DEAL", "已处理"),
+        CLOSE(30, "CLOSE", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CUST_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * MesProductEncodeCfg 匹配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_MATCH_TYPE {
+
+        ORGANIZATION("10", "工厂"),
+        PART("20", "物料"),
+        CUST_CODE("30", "客户代码"),
+        CUST_PART_NO("40", "客户物料号"),
+        WORK_CENTER("50", "产线");
+
+        private String value;
+        private String description;
+
+        MES_MATCH_TYPE(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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesProductEncodeCfg 编码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CODE_TYPE {
+
+        SERIAL_SN("10", "过程条码"),
+        PRODUCT_SN("20", "产品条码"),
+        PACK_SN("30", "包装条码");
+
+        private String value;
+        private String description;
+
+        MES_CODE_TYPE(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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * MesDatasource 数据源类型
      */
@@ -51,10 +242,10 @@ public class MesEnumUtil {
     }
 
     /**
-     * MesRepair 数据对象操作类型
+     * Mes 数据对象操作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_DADA_OPRATE_TYPE {
+    public enum MES_DATA_OPERATE_TYPE {
 
         INSERT(10, "insert"),
         SELECT(20, "select"),
@@ -63,7 +254,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_DADA_OPRATE_TYPE(int value, String description) {
+        MES_DATA_OPERATE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -661,7 +852,8 @@ public class MesEnumUtil {
 
         MES_PLAN_ORDER(10, "生产计划"),
         MES_EQUIPMENT(20, "设备台账"),
-        MES_EQU_TASK_STANDARD(30, "设备作业要求");
+        MES_EQU_TASK_STANDARD(30, "设备作业要求"),
+        MES_CUST_ORDER(40, "客户订单");
 
         private int value;
         private String description;
@@ -2519,7 +2711,8 @@ public class MesEnumUtil {
         PCN_PULL(60, "PCN_PULL"),
         PCN_PUSH(70, "PCN_PUSH"),
         FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
-        REWORK_REPAIR(90, "REWORK_REPAIR");
+        REWORK_REPAIR(90, "REWORK_REPAIR"),
+        PCN_LOGIN(100, "PCN_LOGIN");
 
         private int value;
         private String description;

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

@@ -1933,4 +1933,40 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_TRAVEL_OPERATE {
+
+        WORKCELL_SCAN(10, "工位扫描"),
+        CHECK_QUALITY(20, "质量判定"),
+        DISASSEMBLE_MATERIAL(30, "物料拆解"),
+        REWORK(40, "返修作业");
+
+        private int value;
+        private String description;
+
+        SN_TRAVEL_OPERATE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+
 }

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

@@ -624,7 +624,10 @@ public class WmsEnumUtil {
         VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
         VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
         VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
-        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料");
+        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
+        VDA_QC(290, "VDA_QC", "VDA质检"),
+		VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
+		VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并");
 
 
         private int value;
@@ -803,7 +806,10 @@ public class WmsEnumUtil {
         VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
         VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
-        VDA_SN_("VDA_SN_MERGE", "VDA条码合并");
+        VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
+        VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
+
         private String value;
         private String description;
 

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

@@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
     @Transient
     private String serialNumber;
 }

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

@@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -58,4 +55,13 @@ public class MesPcnSysUserOffline extends BaseBean {
     @ApiParam(value = "部门名称", access = "部门名称")
     private String organizeName;
 
+    @Column(name="USER_TYPE")
+    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    private Integer userType;
+
+    @Lob
+    @Column(name="MENU_LIST")
+    @ApiParam(value ="菜单" , access ="菜单")
+    private String menuList;
+
 }

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

@@ -46,11 +46,13 @@ public class MesProdBindRecordModel {
     private String modifyDatetime;
     @ApiParam("产品条码")
     private String serialNumber;
+    @ApiParam("关联批次")
+    private String lotNo;
     public MesProdBindRecordModel() {
 
     }
 
-    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) {
+    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, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -64,9 +66,10 @@ public class MesProdBindRecordModel {
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
         this.dismantleQty = dismantleQty;
+        this.lotNo = lotNo;
     }
 
-    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) {
+    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, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -80,9 +83,10 @@ public class MesProdBindRecordModel {
         this.kpSn = kpSn;
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
+        this.lotNo = lotNo;
     }
 
-    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, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
+    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, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -101,9 +105,10 @@ public class MesProdBindRecordModel {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.serialNumber = serialNumber;
+        this.lotNo = lotNo;
     }
 
-    public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String 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, String lotNo) {
         this.itemPartNo = itemPartNo;
         this.qty = qty;
         this.isValid = isValid;
@@ -115,5 +120,6 @@ public class MesProdBindRecordModel {
         this.kpSn = kpSn;
         this.parentPartNo = parentPartNo;
         this.serialNumber = serialNumber;
+        this.lotNo = lotNo;
     }
 }

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

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\6 11:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CUST_ORDER")
+@Api("客户信息")
+public class MesCustOrder extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @Column(name = "ORDER_TYPE")
+    @ApiParam("订单类型")
+    private Integer orderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "ORDER_DATE")
+    @ApiParam("订单日期")
+    private String orderDate;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @Column(name = "SOURCE")
+    @ApiParam("计划来源")
+    private String source;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Transient
+    @ApiParam(value = "订单日期查询用，查询开始日期", example = "2019-01-31 23:59:59")
+    public String orderTimeStart;
+
+    @Transient
+    @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
+    public String orderTimeEnd;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\5 10:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCT_ENCODE_CFG")
+@Api("产品编码配置")
+public class MesProductEncodeCfg extends BaseBean {
+
+    @Column(name = "CODE_TYPE")
+    @ApiParam("编码类型")
+    private String codeType;
+
+    @Column(name = "MATCH_TYPE")
+    @ApiParam("匹配类型")
+    private String matchType;
+
+    @Column(name = "MATCH_VALUE")
+    @ApiParam("匹配值")
+    private String matchValue;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("编码规则代码")
+    private String ruleCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustOrderRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustOrder;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\6 13:47
+ * @Modify:
+ **/
+public interface MesCustOrderRepository extends BaseRepository<MesCustOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProductEncodeCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\5 10:59
+ * @Modify:
+ **/
+public interface MesProductEncodeCfgRepository extends BaseRepository<MesProductEncodeCfg, Long> {
+}

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

@@ -1653,7 +1653,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean);
         }
         if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
-            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean);
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
         }
         return packBean;
     }
@@ -1683,4 +1683,60 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 产品编码配置
+     * @param mesProductEncodeCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProductEncodeCfg(MesProductEncodeCfg mesProductEncodeCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProductEncodeCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchValue())) {
+            DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) {
+            DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) {
+            DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) {
+            DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 客户订单
+     * @param mesCustOrder
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesCustOrder(MesCustOrder mesCustOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustOrder, organizeCode);
+        if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) {
+            DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) {
+            DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean);
+        }
+        if (mesCustOrder.getOrderType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesCustOrder.getOrderType(), "orderType", packBean);
+        }
+        if (mesCustOrder.getStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                mesCustOrder.getOrderTimeStart(),
+                mesCustOrder.getOrderTimeEnd(),
+                "orderDate", packBean, true);
+        return packBean;
+    }
 }

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

@@ -224,7 +224,6 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -233,6 +232,16 @@ public class WmsMoveSn extends BaseBean {
         this.refSrc = refSrc;
     }
 
+    public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) {
+        this.partNo = partNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.busiTypeCode = busiTypeCode;
+        this.qty = qty;
+    }
+
     public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
                      String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
                      Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,

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

@@ -166,6 +166,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("报工产线")
     private String productLines;
 
+    @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
+    @ApiParam(value = "待质检比例", example = "1")
+    private Double proportion;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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

@@ -93,6 +93,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("默认收货库存地")
     private String erpAreaNoAdd;
 
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;

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

@@ -81,4 +81,8 @@ public class WmsQCTrans extends BaseBean {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
     public String qcTime;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
 }