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

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :刷新计划规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-07-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_FLUSH_PLAN_RULE")
+@Api("刷新计划规则")
+public class FlushPlanRule extends BaseRule {
+}

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

@@ -71,6 +71,10 @@ public class Operation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="CONS_TYPE")
     @ApiParam(value ="接续方式")
     @FieldAnnotation(defaultValue = "ES")

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

@@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -126,6 +127,11 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String lockTime;
 
+    @ApiParam(value ="是否存在任务冲突")
+    @FieldAnnotation(property = false)
+    @Transient
+    private boolean hasConflict;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
 }

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

@@ -57,6 +57,10 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java

@@ -28,6 +28,7 @@ public class DateDuration {
     private int time = 0;
     private double rate = 0.0;
     private boolean bValid = false;
+    private int unit = 0;
 
     public DateDuration(int value) {
         this.time = value;
@@ -147,6 +148,9 @@ public class DateDuration {
         if (amount < PRECISION)
             return getTime();
 
+        if (this.unit > 0) {
+            amount = Math.ceil(amount / this.unit);
+        }
         double result = (amount * this.rate) + this.time;
         return (int)Math.ceil(result);
     }
@@ -184,10 +188,11 @@ public class DateDuration {
         for (EV_STRING evs : lst) {
             if (evs.type == EV_STRING_TYPE.EVS_GOOD) {
                 AbstractMap.SimpleEntry<Boolean, Integer> extraTime = transTimeEach(evs.value);
-                if (extraTime.getKey() || !oFlg) {
+                if (extraTime.getKey() || oFlg) {
                     this.time += extraTime.getValue();
                 } else {
-                    this.time += extraTime.getValue() * 1;
+                    //this.time += extraTime.getValue() * 1;
+                    this.unit = extraTime.getValue();
                 }
             }
             else {

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * 表格右键菜单
+ */
+@Data
+public class ContextMenu {
+
+    private String text;
+
+    private String uri;
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ShiftReportModel {
+    private List<String> dates = new ArrayList<>();
+    private List<String> headers = new ArrayList<>();
+    private List<String> labels = new ArrayList<>();
+
+    private List<Map<String, List<String>>> datas = new ArrayList<>();
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description :时间段信息，包含指示该时间段是上班还是下班
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+public class TimeBlock implements Comparable<TimeBlock> {
+    private Date begin;
+    private Date end;
+    private boolean onDuty = true;
+    private String shift;
+
+    @Override
+    public int compareTo(TimeBlock o) {
+        if (this.getBegin().equals(o.getBegin())) {
+            if (this.getEnd().equals(o.getEnd())) {
+                return 0;
+            }
+            return this.getEnd().before(o.getEnd()) ? -1 : 1 ;
+        }
+        return this.getBegin().before(o.getBegin()) ? -1 : 1;
+    }
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FlushPlanRuleRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.FlushPlanRule;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FlushPlanRuleRepository extends CrudRepository<FlushPlanRule, Long> {
+}

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

@@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
-    @AnnoOutputColumn(hidden = true)
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             dataSrc = "/impp/operate/sys-user/query-user-by-pager",
             searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
@@ -97,7 +96,6 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
-    @AnnoOutputColumn(hidden = true)
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             dataSrc = "/impp/operate/sys-user/query-user-by-pager",
             searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")

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

@@ -283,7 +283,8 @@ public class ApsEnumUtil {
         CANCEL_PLAN("CANCEL_PLAN", "取消计划"),
         MAT_CALC("MAT_CALC", "物料运算"),
         HEURISTIC("HEURISTIC", "排程运算"),
-        FIELD_SET("FIELD_SET", "字段赋值");
+        FIELD_SET("FIELD_SET", "字段赋值"),
+        FLUSH_PLAN("FLUSH_PLAN", "刷新计划");
 
         private String value;
         private String description;
@@ -420,7 +421,9 @@ public class ApsEnumUtil {
         NEARLY_WORK("NEARLY_WORK", "前后工作"),
         POST_RESOURCE("POST_RESOURCE", "后资源制约"),
         SAME_ASS_RESOURCE("SAME_ASS_RESOURCE", "相同副资源"),
-        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级");
+        RESOURCE_PRIORITY("RESOURCE_PRIORITY", "资源优先级"),
+        RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"),
+        CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
 
         private String value;
         private String description;
@@ -706,7 +709,8 @@ public class ApsEnumUtil {
         NONE("NONE", "不分割"),
         RATIO("RATIO", "按比例分割"),
         COUNT("COUNT", "按数量分割"),
-        BATCH("BATCH", "按批量分割");
+        BATCH("BATCH", "按批量分割"),
+        REMAINDER("REMAINDER", "按余数分割");
 
         private String value;
         private String description;

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

@@ -991,6 +991,51 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * Mes  对象结构是否展示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CFG_IS_SHOW {
+
+        SHOW(1, "是"),
+        NO_SHOW(2, "否");
+
+        private int value;
+        private String description;
+
+        OBJECT_CFG_IS_SHOW(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * Mes  客户订单来源
@@ -1920,7 +1965,8 @@ public class MesEnumUtil {
         ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"),
         SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
-        MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系");
+        MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
+        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入");
 
         private int value;
         private String service;
@@ -5791,7 +5837,18 @@ public class MesEnumUtil {
         STRING("10", "String", "字符串"),
         BOOLEAN("20","Boolean",  "布尔"),
         WORD("30", "Word", "整形-Word"),
-        DWORD("40","Dword",  "整形-DWord");
+        DWORD("40","Dword",  "整形-DWord"),
+        LONG("50", "Long", "长整形-Long"),
+        SHORT("60", "Short", "UShort"),
+        DOUBLE("70", "Double", "双精度-Double"),
+        FLOAT("80", "Float", "单精度-Float"),
+        LLONG("90", "LLong", "LLONG"),
+        QWORD("100", "QWord", "QWORD"),
+        BCD("110", "BCD", "BCD"),
+        LBCD("120", "LBCD", "LBCD"),
+        BYTE("130", "Byte", "Byte"),
+        CHAR("140", "Char", "Char"),
+        Date("150", "DateTime", "日期");
 
         private String value;
         private String code;
@@ -6595,4 +6652,122 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 队列 料架摆放位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_SIDE {
+        POSITIVE(10, "A", "正面"),
+        REVERSE_SIDE(20, "B", "背面");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        GROUP_SIDE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * QAD 解析对象
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QAD_DATA_OBJECT {
+        BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"),
+        CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList",  "MesCustomerPart","客户物料号"),
+        CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList",  "MesCustomer","客户信息"),
+        PART("soapenv#Envelope#SyncItem","getPartList",  "MesPart","物料信息");
+
+        private String code;
+        private String method;
+        private String objectCode;
+        private String description;
+
+        QAD_DATA_OBJECT(String code, String method, String objectCode, String description) {
+            this.code = code;
+            this.method = method;
+            this.objectCode = objectCode;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getMethod() {
+            return method;
+        }
+
+        public String getObjectCode() {
+            return objectCode;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static QAD_DATA_OBJECT getByObjectCode(String objectCode) {
+            for (QAD_DATA_OBJECT qadDataObject : values()) {
+                if (qadDataObject.getObjectCode().equals(objectCode)) {
+                    return qadDataObject;
+                }
+            }
+            return null;
+        }
+
+        public static QAD_DATA_OBJECT getByCode(String code) {
+            for (QAD_DATA_OBJECT qadDataObject : values()) {
+                if (qadDataObject.getCode().equals(code)) {
+                    return qadDataObject;
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -718,7 +718,7 @@ public class MesPcnEnumUtil {
         DEFECTED(20, "不合格"),
         SCRAPED(30, "报废"),
         DISMANTLED(40, "已拆解"),
-        PRE_CHECK(50, "待检测");
+        PRE_CHECK(5, "待检测");
 
         private int value;
         private String description;
@@ -2385,6 +2385,7 @@ public class MesPcnEnumUtil {
         INSTOCKED(40, "入库"),
         SHIPPING(50, "发运"),
         REDO(60, "重做"),
+        FORCE(70, "强过"),
         CLOSE(90, "关闭");
 
         private int value;
@@ -3762,8 +3763,9 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VERIFY_MODE {
-        PART_NO("10", "按物料号匹配"),
-        WORK_CENTER_CODE("20", "按产线匹配");
+        PART_NO_BY_BOM("10", "按物料号匹配By-Bom"),
+        WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"),
+        WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter");
 
         private String value;
         private String description;
@@ -4014,7 +4016,8 @@ public class MesPcnEnumUtil {
     public enum PRODUCE_ERROR_RECORD {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
-        JUMP_STATE(30, "跳过状态点");
+        JUMP_STATE(30, "跳过状态点"),
+        ABNORMAL_DEDUCTION(40, "扣减异常");
 
         private int value;
         private String description;
@@ -4330,4 +4333,141 @@ public class MesPcnEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * MES_产品颜色 	类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_COLOR_TYPE {
+
+        PRODUCT_COLOR(10, "产品颜色"),
+        MATERIAL_COLOR(20, "物料颜色");
+
+        private int value;
+        private String description;
+
+        MES_COLOR_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 选配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTION(10, "选配件"),
+        BOM_DISASSEMBLY(20, "BOM拆解");
+
+        private int value;
+        private String description;
+
+        OPTION_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 关键件校验并转过程条码工步 取值模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VALUE_RANGE {
+
+        SCAN(10, "扫描"),
+        READ_CACHE(20, "读取缓存");
+
+        private int value;
+        private String description;
+
+        VALUE_RANGE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -625,9 +625,9 @@ public class PtlEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_TASK_STATUS {
         CREATE(10, "创建"),
-        EXECUTION(20, "执行中"),
-        COMPLETE(30, "完成"),
-        CANCEL(40, "取消");
+        COMPLETE(20, "完成"),
+        CLOSE(30, "关闭"),
+        EXECUTION(40, "执行中");
 
         private int value;
         private String description;

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

@@ -830,7 +830,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
-        COMPLETE(20, "COMPLETE", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -860,8 +861,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
+        CREATE(10, "CREATE", "创建"),
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;
@@ -915,10 +917,10 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PTL_MAIN_TASK_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
-        CANCELLED(40, "CANCELLED", "已取消");
+        CREATE(10, "CREATE", "创建"),
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭"),
+        EXECUTION(40, "EXECUTION", "执行中");
 
         private int value;
         private String code;
@@ -1413,7 +1415,8 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_TASK_STATUS {
         CREATE(10, "CREATE", "创建"),
-        RECEIPT_FINISH(30, "COMPLETED", "完成");
+        COMPLETE(20, "COMPLETE", "完成"),
+        CLOSE(30, "CLOSE", "关闭");
 
         private int value;
         private String code;

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

@@ -194,7 +194,8 @@ public class WmsEnumUtil {
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
         TAP(40, "TAP", "多角代采购"),
-        AMP(50, "AMP", "AMP收货");
+        AMP(50, "AMP", "AMP收货"),
+        INNER(60, "INNER", "内部收货");
 
         private int value;
         private String code;
@@ -300,6 +301,63 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS_KANBAN {
+        TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
+        RECEIVING(20, "RECEIVING", "收货中"),
+        DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
+        COMPLETED(40, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REC_STATUS_KANBAN(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 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 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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -515,7 +573,8 @@ public class WmsEnumUtil {
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
         TRANSIT_LOCATE(80, "T", "在途库"),
         UTENSIL_LOCATE(90, "U", "器具库"),
-        OPERATION_PALTFORM(100, "W", "工作台");
+        OPERATION_PALTFORM(100, "W", "工作台"),
+        CUST_LOCATE(110, "CUST", "客户库位");
 
         private int value;
         private String code;
@@ -732,7 +791,15 @@ public class WmsEnumUtil {
         CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
         CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
         AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
-        FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
+        FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"),
+        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"),
+        ASSEMBLY_DISASSEMBLY_STORAGE(610, "ASSEMBLY_DISASSEMBLY_STORAGE\n", "总成拆解入库"),
+        INTERNAL_WORK_ORDER_MATERIAL_STORAGE(620, "INTERNAL_WORK_ORDER_MATERIAL_STORAGE", "内部工单物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_STORAGE(630, "PART_NUMBER_CONVERSION_MATERIAL_STORAGE", "零件号转化物料入库"),
+        PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"),
+        INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
+        CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
+        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废");
         private int value;
         private String code;
         private String description;
@@ -1649,6 +1716,42 @@ public class WmsEnumUtil {
      * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        INSPECTION_FREE(10, "免检"),
+        PENDING_QUALITY_INSPECTION(20, "待质检"),
+        QUALITY_INSPECTION_COMPLETED(30, "质检完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 质检业务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
         CREATE(10, "新建"),
         FINISH(20, "处理中"),
@@ -2546,7 +2649,8 @@ public class WmsEnumUtil {
         BOX(10, "BOX", "BOX（盒）"),
         CARTON(20, "CARTON", "CARTON（箱）"),
         PALLET(30, "PALLET", "PALLET（栈板）"),
-        CONTAINER(40, "PALLET", "PALLET（集装箱）");
+        CONTAINER(40, "PALLET", "PALLET（集装箱）"),
+        FEEDER(50, "FEEDER", "料架");
 
         private String code;
         private String description;
@@ -2569,6 +2673,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        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;
+        }
     }
 
     /**
@@ -8454,4 +8568,230 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * RFID操作类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RFID_OPERATE_TYPE {
+        IN_STORAGE(10, "IN_STORAGE", "入库"),
+        SHIPEMNT(20, "SHIPEMNT", "发运"),
+        BACK_STORAGE(30, "BACK_STORAGE", "回库"),
+        UN_BUNDING(40, "UN_BUNDING", "解绑"),
+        BUNDING(50, "BUNDING", "绑定");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        RFID_OPERATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        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 RFID_OPERATE_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;
+        }
+    }
+
+    /**
+     * 频次
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FREQUENCY {
+        ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"),
+        STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"),
+        TASK_GENERATE(30, "AMP", "AMP");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FREQUENCY(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 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 FREQUENCY 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;
+        }
+    }
+
+    /**
+     * 悬挂链库存同步状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUSPEN_STOCK_SYNC_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        HANDLED(20, "HANDLED", "已处理"),
+        HANDLE_ERROR(30, "HANDLE_ERROR", "处理错误"),
+        PLC_HANDLE_OUTITME(40, "PLC_HANDLE_OUTITME", "PLC处理超时"),
+        SRC_DATA_ERROR(50, "SRC_DATA_ERROR", "来源数据解析错误");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        SUSPEN_STOCK_SYNC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        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 SUSPEN_STOCK_SYNC_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/bean/MesBom.java

@@ -81,6 +81,10 @@ public class MesBom extends BaseBean implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String effEndTime;
 
+    @Column(name = "BOM_CODE")
+    @ApiParam("BOM代码")
+    private String bomCode;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -9,9 +9,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.*;
 import java.io.Serializable;
 
 /**
@@ -26,7 +24,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_CELL_FEED_RECORD")
+@Table(name = "MES_CELL_FEED_RECORD", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("工位投料履历信息")
 public class MesCellFeedRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369489107783L;

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

@@ -36,7 +36,7 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     private String custPlantCode;
 
     @Column(name = "QTY")
-    @ApiParam("数量")
+    @ApiParam("配置数量")
     private Integer qty;
 
     @Column(name = "THRESHOLD_QTY")

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

@@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
+    @Column(name = "SHOW_SEQ")
+    @ApiParam("显示顺序")
+    private Integer showSeq;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam("是否显示")
+    private Integer isShow;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;

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

@@ -28,6 +28,7 @@ import java.io.Serializable;
         @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "KP_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME"),
         @Index(columnList = "ITEM_PART_NO")
 })
 @Api("产品绑定记录表")

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

@@ -27,14 +27,14 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_CFG_TYPE")
-@Api("产品配置类型")
+@Api("项目")
 public class MesProdCfgType extends BaseBean implements Serializable {
     private static final long serialVersionUID = -1726288926948811617L;
     @Column(name = "PROD_CFG_TYPE_CODE")
-    @ApiParam("产品配置类型代码")
+    @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
     @Column(name = "PROD_CFG_TYPE_NAME")
-    @ApiParam("产品配置类型名称")
+    @ApiParam("项目名称")
     private String prodCfgTypeName;
 }

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

@@ -68,4 +68,8 @@ public class MesProdPack extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE")
     @ApiParam("项目")
     private String prodCfgType;
+
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
 }

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

@@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("是否执行 1=是 2=否")
     private Integer isActive;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

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

@@ -28,7 +28,7 @@ public class MesProduceErrorRecord extends BaseBean {
     private static final long serialVersionUID = 209753108845613052L;
 
     @Column(name = "ERROR_TYPE")
-    @ApiParam("异常类型 10:工序跳过 20:工步跳过")
+    @ApiParam("异常类型 10:工序跳过 20:工步跳过 40:扣料异常")
     private Integer errorType;
 
     @Column(name = "SERIAL_NUMBER")
@@ -63,5 +63,8 @@ public class MesProduceErrorRecord extends BaseBean {
     @ApiParam("状态点代码")
     private String statusCode;
 
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常内容")
+    private String errorMessage;
 
 }

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

@@ -92,6 +92,14 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("数量标识")
     private String numberFlag;
 
+    @Column(name = "MAXIMUM")
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @Column(name = "MINIMUM")
+    @ApiParam("最小数")
+    private Double minimum = 0d;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;

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

@@ -87,4 +87,12 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
     @ApiParam(value = "检测项类型名称")
     @Transient
     private String businessTypeName;
+
+    @Column(name = "MAXIMUM")
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @Column(name = "MINIMUM")
+    @ApiParam("最小数")
+    private Double minimum = 0d;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable {
     @Column(name = "CNT_QTY")
     @ApiParam("累计数")
     private Integer cntQty;
+
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
 }

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_GROUP_COUNT
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
 
     @Column(name = "SEQ")
     @ApiParam("排序号")
-    private Double seq;
+    private String seq;
 
     @Column(name = "STATUS")
     @ApiParam("状态")

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

@@ -116,6 +116,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已生产数量")
     private Double finsihQty;
 
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
+
     @Transient
     @ApiParam("Vin")
     private String vinCode;

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

@@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable {
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Column(name = "STEP_DISPLAY_NAME")
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

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

@@ -86,37 +86,37 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @ApiParam("防错码长度")
     private Integer pokeYokeLength;
 
-    @Column(name = "PEST1")
-    @ApiParam("PEST编码1")
-    private String pest1;
+    @Column(name = "PSET1")
+    @ApiParam("PSET1")
+    private String pset1;
 
-    @Column(name = "PEST2")
-    @ApiParam("PEST编码2")
-    private String pest2;
+    @Column(name = "PSET2")
+    @ApiParam("PSET2")
+    private String pset2;
 
-    @Column(name = "PEST3")
-    @ApiParam("PEST编码3")
-    private String pest3;
+    @Column(name = "PSET3")
+    @ApiParam("PSET3")
+    private String pset3;
 
-    @Column(name = "PEST4")
-    @ApiParam("PEST编码4")
-    private String pest4;
+    @Column(name = "PSET4")
+    @ApiParam("PSET4")
+    private String pset4;
 
-    @Column(name = "PEST5")
-    @ApiParam("PEST编码5")
-    private String pest5;
+    @Column(name = "PSET5")
+    @ApiParam("PSET5")
+    private String pset5;
 
-    @Column(name = "PEST6")
-    @ApiParam("PEST编码6")
-    private String pest6;
+    @Column(name = "PSET6")
+    @ApiParam("PSET6")
+    private String pset6;
 
-    @Column(name = "PEST7")
-    @ApiParam("PEST编码7")
-    private String pest7;
+    @Column(name = "PSET7")
+    @ApiParam("PSET7")
+    private String pset7;
 
-    @Column(name = "PEST8")
-    @ApiParam("PEST编码8")
-    private String pest8;
+    @Column(name = "PSET8")
+    @ApiParam("PSET8")
+    private String pset8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")
@@ -165,4 +165,12 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @Column(name = "MULTIMEDIA_PLUG_QTY")
     @ApiParam("多媒体插头数量")
     private Double multimediaPlusQty;
+
+    @Column(name = "QUALIFIED_COUNT")
+    @ApiParam("应收合格数")
+    private Double qualifiedCount;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否复核校验")
+    private Integer isCheck;
 }

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

@@ -23,7 +23,8 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
-        @Index(columnList = "CREATE_DATE_TIME")
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "WORK_CENTER_CODE")
 })
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean implements Serializable {

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

@@ -282,6 +282,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("零件名称集合")
     private String partNameList;
 
+    @Transient
+    @ApiParam("客户集合")
+    private List<String> custList;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -37,10 +37,12 @@ public class ButtonDynamicModel {
     private String paramValue;
 
 
-    public ButtonDynamicModel(Long id, String buttonCode, String buttonName) {
+    public ButtonDynamicModel(Long id, String buttonCode, String buttonName, String windowNo, String windowModuleBack) {
         this.id = id;
         this.buttonCode = buttonCode;
         this.buttonName = buttonName;
+        this.windowNo = windowNo;
+        this.windowModuleBack = windowModuleBack;
     }
 
 

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

@@ -102,6 +102,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("默认赋值属性")
     private String defaultRule;
 
+    @ApiParam("工装代码")
+    private String toolingCode;
+
     public MesPlcModel() {
 
     }
@@ -109,7 +112,8 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device,
+                       String objectCode, String opcUrl, Integer plcType, String defaultRule, String toolingCode) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -139,5 +143,6 @@ public class MesPlcModel implements Serializable {
         this.opcUrl = opcUrl;
         this.plcType = plcType;
         this.defaultRule = defaultRule;
+        this.toolingCode = toolingCode;
     }
 }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 动作请求参数
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+public class OnLineSnModel {
+
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+}

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

@@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean {
     @ApiParam("父阶物料名称")
     private String parentPartName;
 
+    @ApiParam("实际包装数量")
+    private Integer compQty;
+
     private List<ProdPackModel> prodPackageList;
 
     private String partNameRdd;

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

@@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("产品条码")
     public String productSn;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     // 包装主表--包装编号
     @ApiParam("一检箱条码")
     public String packageNo;
@@ -33,6 +36,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("箱条码状态")
     public Integer printStatus;
 
+    @ApiParam("打印状态")
+    public String printStatusDesc;
+
     // 涂装客户标签打印
     @ApiParam("客户标签")
     public String custSn;
@@ -43,7 +49,7 @@ public class ProdPackModel implements Serializable {
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    public String modifyDateTime;
+    public String modifyDatetime;
 
     @ApiParam("工单号")
     public String workOrderNo;
@@ -54,21 +60,31 @@ public class ProdPackModel implements Serializable {
     @ApiParam("物料号")
     public String parentPartNo;
 
+    @ApiParam("是否封箱")
+    public Integer isSealed;
+
     public ProdPackModel() {
     }
 
-    public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
-        this.productSn = productSn;
+    public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) {
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.createDatetime = createDatetime;
         this.printStatus = printStatus;
     }
 
-    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
-        this.productSn = productSn;
+    public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) {
+        this.serialNumber = serialNumber;
         this.packageNo = packageNo;
         this.custSn = custSn;
-        this.processCode = processCode;
-        this.modifyDateTime = modifyDateTime;
+        this.printStatus = printStatus;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public ProdPackModel(Integer isSealed,String serialNumber, String packageNo, String createDatetime) {
+        this.isSealed = isSealed;
+        this.serialNumber = serialNumber;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
     }
 }

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

@@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable {
 
     //getWaitQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable {
         this.finsihQty = finsihQty;
         this.qty = qty;
         this.orderNo = orderNo;
-        this.pptCode=pptCode;
+        this.pptCode = pptCode;
+        this.produceCategoryCode = produceCategoryCode;
     }
+
     //getAlreadyQueueOrderModelNoSn
-    public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.workType = workType;
         this.orderNo = orderNo;
-        this.serialNumber=serialNumber;
+        this.serialNumber = serialNumber;
     }
 
     //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
@@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
+    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/15 1:35 下午
+ * @Modify:
+ */
+@Data
+public class SoapModel {
+
+    private String soapJson;
+
+    private List<Map<String, Object>> soapList;
+}

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

@@ -62,4 +62,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("工位参数")
     private Map<String, String> wcpcMap = new HashMap<>();
+
+    @ApiParam("定时秒数")
+    private Integer timer;
 }

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

@@ -73,6 +73,9 @@ public class StepModel implements Serializable {
     @ApiParam("参数代码")
     private String paramCode;
 
+    @ApiParam("工步展示名称")
+    private String stepDisplayName;
+
     /**
      * 工作单元代码
      */
@@ -83,7 +86,7 @@ public class StepModel implements Serializable {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -93,6 +96,7 @@ public class StepModel implements Serializable {
         this.processCode = processCode;
         this.stepSeq = stepSeq;
         this.paramCode = paramCode;
+        this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
     }
 }

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

@@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -954,6 +955,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
         }
+        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
@@ -2037,7 +2044,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
             DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
         }
-        if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesProdBindRecord.getCreateDateTimeStart(),
                     mesProdBindRecord.getCreateDateTimeEnd(),
@@ -2376,19 +2383,20 @@ public class MesHqlPack {
 
     /**
      * 界面组件配置
+     *
      * @param windowModule
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
-        if(!StringUtils.isEmpty(windowModule.getWindowNo())){
+        if (!StringUtils.isEmpty(windowModule.getWindowNo())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
         }
-        if(!StringUtils.isEmpty(windowModule.getModuleCode())){
+        if (!StringUtils.isEmpty(windowModule.getModuleCode())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
+        if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) {
             DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
         }
         return packBean;
@@ -2396,22 +2404,23 @@ public class MesHqlPack {
 
     /**
      * 界面组件参数配置
+     *
      * @param windowModuleParam
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
-        if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
+        if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
+        if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
+        if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
         }
-        if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
+        if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) {
             DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
         }
         return packBean;
@@ -2419,22 +2428,23 @@ public class MesHqlPack {
 
     /**
      * 数据预警配置
+     *
      * @param dataWarning
      * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
-        if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
+        if (!StringUtils.isEmpty(dataWarning.getObjectCode())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
+        if (!StringUtils.isEmpty(dataWarning.getWarningRule())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
+        if (!StringUtils.isEmpty(dataWarning.getWarningItem())) {
             DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
         }
-        if(!StringUtils.isEmpty(dataWarning.getInformMode())){
+        if (!StringUtils.isEmpty(dataWarning.getInformMode())) {
             DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
         }
         return packBean;
@@ -2458,6 +2468,7 @@ public class MesHqlPack {
 
         return result;
     }
+
     /**
      * 封装公用查询参数
      *
@@ -2485,9 +2496,9 @@ public class MesHqlPack {
     }
 
 
-
     /**
      * 按条件分页查询产品条码补打印数据
+     *
      * @param mesProduceSn
      * @return
      */
@@ -2714,7 +2725,7 @@ public class MesHqlPack {
 
     public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
         DdlPackBean packBean;
-        if(dataAuth.getIsValidVal() == 0) {
+        if (dataAuth.getIsValidVal() == 0) {
             packBean = DdlPackBean.getDdlPackBean(organizeCode);
         } else {
             packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
@@ -2869,6 +2880,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板信息分页查询条件
+     *
      * @param template
      * @return
      */
@@ -2883,6 +2895,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板明细信息分页查询条件
+     *
      * @param details
      * @return
      */
@@ -2945,6 +2958,7 @@ public class MesHqlPack {
 
     /**
      * 物料校验项
+     *
      * @param partCheck
      * @param organizeCode
      * @return
@@ -2990,6 +3004,7 @@ public class MesHqlPack {
 
     /**
      * MES AGV停机记录信息条件查询
+     *
      * @param stopRecord
      * @return
      */
@@ -3093,6 +3108,7 @@ public class MesHqlPack {
 
     /**
      * 扩展对象配置
+     *
      * @param extendObjectCfg
      * @param organizeCode
      * @return
@@ -3116,6 +3132,7 @@ public class MesHqlPack {
 
     /**
      * 产品工作中心配置
+     *
      * @param prodWorkCenter
      * @param organizeCode
      * @return
@@ -3133,6 +3150,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列
+     *
      * @param queueJitPlan
      * @param organizeCode
      * @return
@@ -3167,6 +3185,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列明细
+     *
      * @param queueJitPlanDetail
      * @param organizeCode
      * @return
@@ -3184,6 +3203,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列BOM
+     *
      * @param queueJitPlanBom
      * @param organizeCode
      * @return

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

@@ -630,6 +630,9 @@ public class MesPcnHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
         }
+        if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) {
+            DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/7/15 21:43
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+public class PsetModel {
+
+    private String psetName;
+
+    private Integer psetNum;
+
+    private Integer psetCount;
+
+    private Integer actualCount;
+
+    private boolean torqueStatus;
+}

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

@@ -5,6 +5,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : MES扭矩采集模型
@@ -38,37 +42,37 @@ public class TorqueCollectionModel implements Serializable {
     private String partName;
 
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private Integer pset1;
 
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private Integer pset2;
 
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private Integer pset3;
 
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private Integer pset4;
 
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private Integer pset5;
 
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private Integer pset6;
 
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private Integer pset7;
 
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private Integer pset8;
 
     @ApiParam("扭矩枪编号")
     private Integer torqueNo;
 
     @ApiParam("PEST号")
-    private Integer pestNum;
+    private Integer psetNum;
 
     @ApiParam("PEST数量")
-    private Integer pestCount;
+    private Integer psetCount;
 
     /**
      * 1-未采集， 2-已采集, 3-无需打扭矩
@@ -88,6 +92,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("确认扫描次数")
     private Integer checkScanCount;
 
+    @ApiParam("实际确认扫描次数")
+    private Integer actualCheckScanCount;
+
     @ApiParam("组合码发送顺序")
     private Integer sendSeq;
 
@@ -103,8 +110,39 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("是否黄枪")
     private Integer isYellowGun;
 
+    @ApiParam("应收合格数")
+    private Double qualifiedCount;
+
+    @ApiParam("实际合格数")
+    private Double actualQualifiedCount;
+
+    @ApiParam("是否已经发送了新的组合码")
+    private boolean hasSendAsciiWhenYellow;
+
+    @ApiParam("工步信息行颜色")
+    private String color;
+
+    @ApiParam("扭矩显示信息")
+    private String torqueInfo;
+    @ApiParam("扭矩颜色")
+    private String torqueColor;
+
+    @ApiParam("绑定关键件信息")
+    private String bindPartKeyInfo;
+    @ApiParam("绑定关键件颜色")
+    private String bindPartKeyColor;
+
+    @ApiParam("是否大枪")
+    private Integer isPf;
+
+    @ApiParam("psets总数")
+    private Integer psetSum;
+
+    private Map<String, PsetModel> psets = new LinkedHashMap<>();
+
     /**
      * 大枪查询结果构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode
@@ -120,7 +158,7 @@ public class TorqueCollectionModel implements Serializable {
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
                                  String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
-                                 Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+                                 Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -133,44 +171,62 @@ public class TorqueCollectionModel implements Serializable {
         this.yellowGunRule = yellowGunRule;
         this.isEndSeq = isEndSeq;
         this.groupCode = groupCode;
+        this.isPf = isPf;
+        this.qualifiedCount = qualifiedCount;
     }
 
     /**
      * 小枪结果数据构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode
      * @param colorCode
      * @param partNo
      * @param partName
-     * @param pest1
-     * @param pest2
-     * @param pest3
-     * @param pest4
-     * @param pest5
-     * @param pest6
-     * @param pest7
-     * @param pest8
+     * @param pset1
+     * @param pset2
+     * @param pset3
+     * @param pset4
+     * @param pset5
+     * @param pset6
+     * @param pset7
+     * @param pset8
      * @param torqueNo
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
-                                 String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
-                                 Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
-                                 Integer torqueNo) {
+                                 String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
+                                 Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
         this.colorCode = colorCode;
         this.partNo = partNo;
         this.partName = partName;
-        this.pest1 = pest1;
-        this.pest2 = pest2;
-        this.pest3 = pest3;
-        this.pest4 = pest4;
-        this.pest5 = pest5;
-        this.pest6 = pest6;
-        this.pest7 = pest7;
-        this.pest8 = pest8;
+        this.pset1 = pset1;
+        this.pset2 = pset2;
+        this.pset3 = pset3;
+        this.pset4 = pset4;
+        this.pset5 = pset5;
+        this.pset6 = pset6;
+        this.pset7 = pset7;
+        this.pset8 = pset8;
         this.torqueNo = torqueNo;
+        this.sendSeq = sendSeq;
+        this.checkScanCount = checkScanCount;
+        assemblePsets();
     }
+
+    private void assemblePsets() {
+        psets.put("pset1", new PsetModel("pset1", 1, this.pset1, 0, false));
+        psets.put("pset2", new PsetModel("pset2", 2, this.pset2, 0, false));
+        psets.put("pset3", new PsetModel("pset3", 3, this.pset3, 0, false));
+        psets.put("pset4", new PsetModel("pset4", 4, this.pset4, 0, false));
+        psets.put("pset5", new PsetModel("pset5", 5, this.pset5, 0, false));
+        psets.put("pset6", new PsetModel("pset6", 6, this.pset6, 0, false));
+        psets.put("pset7", new PsetModel("pset7", 7, this.pset7, 0, false));
+        psets.put("pset8", new PsetModel("pset8", 8, this.pset8, 0, false));
+    }
+
 }

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 定时同步悬挂链库存数据JOB
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-15 14:47
+ * @Modify:
+ **/
+@Data
+public class WmsSuspenStockSyncModel implements Serializable {
+
+    private static final long serialVersionUID = -6690672187776424774L;
+
+    private String src;// 来源数据
+    private String serverUrl;//地址
+    private Integer namespaceIndex;//命名空间索引，默认为2
+    private String userName;//用户名
+    private String password;//密码
+    private Double requestInterval;//请求间隔,默认为500
+    private String readTagName;//读的地址
+    private String partTagNameA;//物料号A
+    private String partTagNameB;//物料号B
+    private String qtyTagNameA;//数量A
+    private String qtyTagNameB;//数量B
+    private String lotNoTagNameA;//批次A
+    private String lotNoTagNameB;//批次B
+    private String locateTagName;//库位代码
+    private Integer plcExeOutTime;//超时时间
+    private String ackTagName;//修改的地址
+    private Integer tagValueType;//数据类型
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java

@@ -39,10 +39,18 @@ public class IfPickData extends BaseBean implements Serializable {
     @ApiParam("区段编号")
     private String sectionNo;
 
+    @Column(name = "SECTION_TASK_NO")
+    @ApiParam("区段任务编号")
+    private String sectionTaskNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编号")
     private String partNo;
 
+    @Column(name = "BIN_NO")
+    @ApiParam("BIN位代码")
+    private String binNo;
+
     @Column(name = "QTY")
     @ApiParam("拣货数量")
     private Integer qty;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TIME")
+@Api("工步参数")
+public class PtlTime extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6674121566943415827L;
+    @Column(name = "MODULE")
+    @ApiParam("组件")
+    private String module;
+
+    @Column(name = "ELAPSE")
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class PojoFieldModel implements Serializable {
+
+    private static final long serialVersionUID = 366939009033748970L;
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class PojoModel implements Serializable {
+    private static final long serialVersionUID = -3491931203656275910L;
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<PojoFieldModel> fieldList;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlTime;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PtlTimeRepository extends BaseRepository<PtlTime, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -335,6 +335,12 @@ public class PtlHqlPack {
         return packBean;
     }
 
+    /**
+     * 区域
+     * @param area
+     * @param organizeCode
+     * @return
+     */
     public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode);
         DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean);
@@ -342,6 +348,12 @@ public class PtlHqlPack {
         return packBean;
     }
 
+    /**
+     * 流程状态异常记录
+     * @param routeStatusErrorRecord
+     * @param organizeCode
+     * @return
+     */
     public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
         DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
@@ -351,4 +363,16 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
         return packBean;
     }
+
+    /**
+     * IF_拣货数据
+     * @param pickData
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getIfPickData(IfPickData pickData, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean);
+        return packBean;
+    }
 }

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

@@ -16,6 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 盘点单冻结信息
@@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
     public Integer differenceType;
 
+    /**
+     * 差异类型：10：盘平，20：盘亏，30盘赢
+     */
+    @Transient
+    @ApiParam("差异集合")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
+    public List<Integer> differenceTypeList;
+
     public Integer getDifferenceTypeVal() {
         return this.differenceType == null ?
         -1: this.differenceType;

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

@@ -173,4 +173,8 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "子位置号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemSeqNo;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
 }

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

@@ -223,6 +223,18 @@ public class WmsDocMovementMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
     private Integer isGoodProduct;
 
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "REMAKE")
+    @ApiParam(value = "备注1")
+    private Integer remake;
+
+    @Column(name = "DESC")
+    @ApiParam(value = "备注2")
+    private String desc;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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

@@ -227,6 +227,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "库位箱数")
     private Long qty;
 
+    @Transient
+    @ApiParam(value = "不等于库位类型")
+    private Integer notLocateType;
+
     public WmsLocate() {
     }
 

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

@@ -256,6 +256,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer consignation = 2;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }

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

@@ -235,7 +235,7 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
                          String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
-                         String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+                         String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) {
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
@@ -256,6 +256,7 @@ public class WmsMoveMaster extends BaseBean {
         this.createUser = createUser;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.refSrc = refSrc;
     }
 
     public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){

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

@@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 库存移动单条码信息
@@ -76,6 +81,7 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
+
     @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
@@ -163,6 +169,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "SERIAl_SN")
+    @ApiParam("产品条码")
+    public String serialSn;
+
     @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

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

@@ -216,6 +216,19 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "方向")
     private Integer podDir;
 
+
+    @Column(name = "COST_CENTER")
+    @ApiParam(value = "成本中心")
+    private String costCenter;
+
+    @Column(name = "DESC")
+    @ApiParam(value = "备注2")
+    private String desc;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     private Long shippingId;
 

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

@@ -171,6 +171,10 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    @ApiParam("发运单号")
+    @Column(name = "SHIPMENT_NOTE_NUMBER")
+    public String shipmentNoteNumber;
+
     public WmsPOMaster() {
 
     }

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

@@ -1,6 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 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;
@@ -34,6 +38,7 @@ public class WmsPackage extends BaseBean {
     public String packageNo;
 
     @Column(name="PACKAGE_TYPE_ID")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
     @ApiParam(value = "包装类型", example = "1")
     public Integer packTypeId;
 
@@ -64,4 +69,9 @@ public class WmsPackage extends BaseBean {
     @Column(name="MEMO")
     @ApiParam(value = "备注")
     public String memo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateNo;
 }

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

@@ -284,6 +284,13 @@ public class WmsPart extends BaseBean {
     public Integer isRecycle;
 
 
+    @Column(name = "FREQUENCY")
+    @ApiParam(value = "频次", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer frequency;
+
+
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : RFID条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-10 14:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_RFID_OPERATE_RECORD")
+@Api("RFID条码操作记录表")
+public class WmsRfidOperateRecord extends BaseBean {
+    private static final long serialVersionUID = -2506345764570725810L;
+
+    @Column(name="RFID_SN")
+    @ApiParam("RFID_条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String rfidSn;
+
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE")
+    public Integer operateType;
+
+    @Column(name="SRC_LOCATE")
+    @ApiParam("源库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String srcLocate;
+
+    @Column(name="DEST_LOCATE")
+    @ApiParam("目标库位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String destLocate;
+
+    @Column(name="SRC_QTY")
+    @ApiParam("源数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Integer srcQty;
+
+    @Column(name="DEST_QTY")
+    @ApiParam("目标数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    public Integer destQty;
+}

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

@@ -94,6 +94,10 @@ public class WmsSerialSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String packageNo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
     public WmsSerialSn() {
 
     }

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

@@ -84,6 +84,11 @@ public class WmsShippingFlag extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagFax;
 
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam(value = "存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String destZoneNo;
+
     @Column(name="TEMPLATE_NO")
     @ApiParam("模板编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,

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

@@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "检测结果ID")
     private Long summaryId;
 
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
+
     public WmsStockSn() {
     }
 
@@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean {
                       String shippingFlag, String workCenterCode, Integer snType,
                       String packagePartNo, Integer useCount, Integer seqNo,
                       String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
-                      String prodCfgTypeName, String custNameRdd, String workOrderCode) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -792,6 +796,17 @@ public class WmsStockSn extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.custNameRdd = custNameRdd;
         this.workOrderCode = workOrderCode;
+        this.color = color;
+    }
+
+    public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
     }
 
 

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

@@ -0,0 +1,117 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 悬挂链库存同步数据
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-14 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
+@Api("悬挂链库存同步数据")
+public class WmsSuspenStockSync extends BaseBean {
+
+    @Column(name = "SRC")
+    @ApiParam(value = "数据来源")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String src;
+
+    @Column(name = "SERVER_URL")
+    @ApiParam(value = "服务地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String serverUrl;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateNo;
+
+    @Column(name = "PART_NO_A")
+    @ApiParam(value = "物料号A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNoA;
+
+    @Column(name = "PART_NO_B")
+    @ApiParam(value = "物料号B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNoB;
+
+    @Column(name = "QTY_A")
+    @ApiParam(value = "数量A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double qtyA;
+
+    @Column(name = "qty_b")
+    @ApiParam(value = "数量B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double qtyB;
+
+    @Column(name = "LOT_NO_A")
+    @ApiParam(value = "批次A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNoA;
+
+    @Column(name = "LOT_NO_B")
+    @ApiParam(value = "批次B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNoB;
+
+    @Column(name = "STATUS")
+    @ApiParam(value = "状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SUSPEN_STOCK_SYNC_STATUS.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer status;
+
+    @Column(name = "ERROR_MSG")
+    @ApiParam(value = "错误信息")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String errorMsg;
+
+    @Transient
+    @ApiParam(value = "物料数组集")
+    private String[] partNos;
+
+    @Transient
+    @ApiParam(value = "数量数组集")
+    private Double[] qtys;
+
+    @Transient
+    @ApiParam(value = "批次数组集")
+    private String[] lotNos;
+
+    @Transient
+    @ApiParam(value = "物料数据List")
+    private List<WmsPart> partList;
+
+    @Transient
+    @ApiParam(value = "物料数据Map")
+    private Map<String, WmsPart> partNameMap;
+
+}

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

@@ -100,30 +100,29 @@ public class WmsTractics extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String tracticsEndTime;
 
-    @Column(name="LEV1_STRATEGY")
+    @Column(name="LEV1_STRATEGY_PUT")
     @ApiParam(value ="1级策略上架")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
-    private Integer lev1Strategy;
+    private Integer lev1StrategyPut;
 
-//    @Column(name="LEV1_STRATEGY")
-    @Transient
+    @Column(name="LEV1_STRATEGY_PICKING")
     @ApiParam(value ="1级策略拣货")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
     private Integer lev1StrategyPicking;
 
-    @Column(name="LEV2_STRATEGY")
+    @Column(name="LEV2_STRATEGY_PUT")
     @ApiParam(value ="2级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
-    private Integer lev2Strategy;
+    private Integer lev2StrategyPut;
 
-    @Column(name="LEV3_STRATEGY")
+    @Column(name="LEV3_STRATEGY_PUT")
     @ApiParam(value ="3级策略")
     @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
-    private Integer lev3Strategy;
+    private Integer lev3StrategyPut;
 
 //    public String getIev1StrategyPicking (String lev1StrategyPicking) {
 //        return this.lev1Strategy = lev1StrategyPicking;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class MappingItem {
+public class MappingItem implements Comparable<MappingItem> {
     /**
      * 来源字段名称
      */
@@ -38,6 +38,11 @@ public class MappingItem {
      */
     public Object defaultValue;
 
+    /**
+     * 字段的顺序号
+     */
+    public int seq;
+
     @Override
     public String toString() {
         return "srcName:"
@@ -45,6 +50,12 @@ public class MappingItem {
                 + this.destBeanName + ", destName"
                 + this.destName + ", defaultValue:"
                 + this.defaultValue + ", destPk:"
-                + this.destPk;
+                + this.destPk + ", seq:"
+                + this.seq;
+    }
+
+    @Override
+    public int compareTo(MappingItem o) {
+        return this.seq - o.seq;
     }
 }

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-07-09 9:50 上午
+ * @Modify:
+ **/
+@Data
+@Api("静态盘点查询输出实体类")
+public class WmsReceiptKanbanDto {
+
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @ApiParam(value = "频次")
+    private String frequency;
+
+    @ApiParam(value = "供应商名称")
+    private String verdorName;
+
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+
+    @ApiParam(value = "道口")
+    private String dock;
+
+    @ApiParam(value = "项目")
+    private String prodCfgTypeCode;
+
+    @ApiParam(value = "窗口时间")
+    private String planDate;
+
+    @ApiParam(value = "开始收货时间")
+    private String earliestReceTime;
+
+    @ApiParam(value = "结束收货时间")
+    private String latestReceTime;
+
+    @ApiParam(value = "收货状态")
+    private String receStatus;
+
+    @ApiParam(value = "质检状态")
+    private String qcStatus;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRfidOperateRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsRfidOperateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : RFID条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-10 14:46
+ * @Modify:
+ **/
+@Repository
+public interface WmsRfidOperateRecordRepository extends BaseRepository<WmsRfidOperateRecord, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSuspenStockSync;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-14 10:33
+ * @Modify:
+ **/
+@Repository
+public interface WmsSuspenStockSyncRepository extends BaseRepository<WmsSuspenStockSync, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -198,6 +198,8 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
         //查询参数封装
         DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getLocateNo(), "locateNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);
@@ -1756,13 +1758,13 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
+    /*public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
 
-        /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+        *//*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
@@ -1785,22 +1787,24 @@ public class WmsHqlPack {
                     packMutilConditionHql(mapList, "PART_NO", "partNo", result);
                 }
             }
-        }*/
+        }*//*
 
         //转换封装后的hql
-        /*String packedHql = result.getPackedHql();
+        *//*String packedHql = result.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        result.setWhereAppend(packedHql);*/
+        result.setWhereAppend(packedHql);*//*
         // 通用数据拼接
         WmsDataAuth wmsDataAuth = new WmsDataAuth();
         wmsDataAuth.setOrganizeCode(organizeCode);
         getStringBuilderPack(wmsDataAuth, result);
         return result;
-    }
+    }*/
+
+
 
     /**
      * 把 List<Map> 中的一组数据重新封装到List<String>中
@@ -1845,7 +1849,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
+    /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
         DdlPackBean packBean = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
@@ -1865,13 +1869,13 @@ public class WmsHqlPack {
             }
         }
         //转换封装后的hql
-        /*String packedHql = packBean.getPackedHql();
+        *//*String packedHql = packBean.getPackedHql();
         if(packedHql.startsWith(" or")){
             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
             System.out.println(packedHql);
         }
 
-        packBean.setWhereAppend(packedHql);*/
+        packBean.setWhereAppend(packedHql);*//*
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
@@ -1880,7 +1884,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
         return packBean;
-    }
+    }*/
 
     /**
      * 根据条件查询dataAuth

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./