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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -556,6 +556,9 @@ public class AndonHqlPack {
         if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }

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

@@ -218,6 +218,17 @@ public class ImppEnumUtil {
             return tmp;
         }
 
+
+        public static LOG_LEVEL valueOf(int val) {
+            LOG_LEVEL tmp = ERROR;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -419,6 +430,48 @@ public class ImppEnumUtil {
     }
 
     /**
+     * 用户消息发送状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_SEND_STATUS {
+
+        SENDING(1, "发送中"),
+        SEND_SUCCESS(2, "发送成功"),
+        SEND_FAIL(3, "发送失败");
+
+        private int value;
+        private String description;
+
+        MESSAGE_SEND_STATUS() {
+        }
+
+        MESSAGE_SEND_STATUS(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;
+        }
+
+    }
+
+    /**
      * 用户消息类型
      * 1.NOTICE：通知
      * 2.STATION_LETTER：站内信

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

@@ -1965,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;
@@ -4275,15 +4276,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -4907,16 +4899,6 @@ public class MesEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -5002,11 +4984,11 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
+        public static Integer descriptionOfValue(String description) {
-            String tmp = null;
+            Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                    tmp = values()[i].value;
                 }
             }
             return tmp;
@@ -5836,7 +5818,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;
@@ -6691,4 +6684,106 @@ public class MesEnumUtil {
             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;
+        }
+    }
+
+    /**
+     * 工位BOM  绑定物料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BIND_PART_TYPE {
+        POSITIVE(10, "半成品"),
+        REVERSE_SIDE(20, "原材料");
+
+        private Integer value;
+        private String description;
+
+        BIND_PART_TYPE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -20,7 +20,9 @@ public class MesPcnEnumUtil {
         MONITOR_MODULE(10, "监听组件"),
         REVEAL_MODULE(20, "展示组件"),
         BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        TIMING_MODULE(40, "定时组件"),
+        PCS_BACK_MODULE(50, "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
 
         private int value;
         private String description;
@@ -2542,7 +2544,9 @@ public class MesPcnEnumUtil {
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
         PROCESS_CONTENT("processContent", "过程组件内容"),
-        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
+        TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
 
         private String value;
         private String description;
@@ -2919,7 +2923,9 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
-        SHOW(20, "展示组件");
+        SHOW(20, "展示组件"),
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;
@@ -3763,8 +3769,9 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VERIFY_MODE {
-        PART_NO("10", "按物料号匹配"),
+        PART_NO_BY_BOM("10", "按物料号匹配By-Bom"),
-        WORK_CENTER_CODE("20", "按产线匹配");
+        WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"),
+        WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter");
 
         private String value;
         private String description;
@@ -4015,7 +4022,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;
@@ -4331,4 +4339,229 @@ 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;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AGV_BUTTON_TRIGGER {
+
+        DELAY(10, "延时启动"),
+        EMERGENCY_STOP(20, "紧急停止");
+
+        private int value;
+        private String description;
+
+        AGV_BUTTON_TRIGGER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_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 PLC_DATA_DIRECT {
+
+        PLC_WRITE(10, "plc->mes"),
+        MES_WRITE(20, "mes->plc"),
+        SHARE(30, "共用");
+
+        private int value;
+        private String description;
+
+        PLC_DATA_DIRECT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
 }

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(20, "完成"),
-        COMPLETE(30, "完成"),
+        CLOSE(30, "关闭"),
-        CANCEL(40, "取消");
+        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", "新建"),
+        CREATE(10, "CREATE", "创建"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
+        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", "新建"),
+        CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
+        COMPLETE(20, "COMPLETE", "完成"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
+        CLOSE(30, "CLOSE", "关闭"),
-        CANCELLED(40, "CANCELLED", "已取消");
+        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;
@@ -763,18 +764,18 @@ public class WmsEnumUtil {
         VDA_QC(290, "VDA_QC", "VDA质检"),
         VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
         VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
-        KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
+        RECEPTION(320, "RECEPTION", "让步接收"),
-        KT_SCRAP(330, "KT_SCRAP", "KT报废"),
+        SCRAP(330, "SCRAP", "报废"),
-        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
+        QUARANTINE(340, "QUARANTINE", "隔离"),
-        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
+        BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"),
-        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
+        DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"),
-        KT_RETURN(370, "KT_RETURN", "KT退货"),
+        RETURN(370, "RETURN", "退货"),
-        KT_REWORK(380, "KT_REWORK", "KT返工"),
+        REWORK(380, "REWORK", "返工"),
-        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
+        MISCALCULATION(390, "MISCALCULATION", "误判"),
-        KT_SORTING(400, "KT_SORTING", "KT分选"),
+        SORTING(400, "SORTING", "分选"),
         VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
         VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        DEFINITE(430, "DEFINITE", "合格"),
         VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
@@ -790,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;
@@ -8709,4 +8718,80 @@ public class WmsEnumUtil {
             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-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -57,29 +57,11 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="主对象元素名称")
     private String priElementNameRdd;
 
-    @Column(name="PRI_ELEMENT_PROPERTY_ID")
-    @ApiParam(value ="主对象元素属性id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long priElementPropertyId;
-
-    @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
-    @ApiParam(value ="主对象元素属性名称")
-    private String priElementPropertyNameRdd;
-
-    @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
-    @ApiParam(value ="主对象元素属性code")
-    private String priElementPropertyCodeRdd;
-
     // 枚举:BlockFormEnumUtil.TRIGGER_EVENT
     @Column(name="PRI_ELEMENT_EVENT")
     @ApiParam(value ="主对象元素事件")
     private Integer priElementEvent;
 
-    // 枚举:BlockFormEnumUtil.SQL_REF_TYPE
-    @Column(name="ASSOCIATE_TYPE")
-    @ApiParam(value ="关联类型")
-    private Integer associateType;
-
     @Column(name="SEC_METHOD_DETAIL_ID")
     @ApiParam(value ="关联功能明细id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -98,19 +80,6 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="关联对象元素名称")
     private String secElementNameRdd;
 
-    @Column(name="SEC_ELEMENT_PROPERTY_ID")
-    @ApiParam(value ="关联对象元素属性id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long secElementPropertyId;
-
-    @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
-    @ApiParam(value ="关联对象元素属性名称")
-    private String secElementPropertyNameRdd;
-
-    @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
-    @ApiParam(value ="关联对象元素属性Code")
-    private String secElementPropertyCodeRdd;
-
     @Transient
     @ApiParam(value ="表单功能明细关联属性")
     private List<BfMethodDetailPropertyRef> refList;

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.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 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/MesEquipmentTooling.java

@@ -79,6 +79,10 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
     @ApiParam("按钮颜色")
     private String btnColor;
 
+    @Transient
+    @ApiParam("按钮类别")
+    private String btnType;
+
     public Integer getToolingType() {
         return this.toolingType == null ? 0 : this.toolingType;
     }

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

@@ -134,6 +134,14 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("默认赋值属性")
     private String defaultRule;
 
+    @Column(name = "DATA_DIRECT")
+    @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址")
+    private Integer dataDirect;
+
+    @Column(name = "CALLBACK_METHOD")
+    @ApiParam("回调方法名称")
+    private String callbackMethod;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

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

@@ -124,4 +124,8 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("本批次生产总数")
+    private Double locSrcLotNoQty;
+
 }

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/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

@@ -176,6 +176,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("主队列状态")
     private Integer masterStatus;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

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")
+    @Column(name = "PSET1")
-    @ApiParam("PEST编码1")
+    @ApiParam("PSET1")
-    private String pest1;
+    private String pset1;
 
-    @Column(name = "PEST2")
+    @Column(name = "PSET2")
-    @ApiParam("PEST编码2")
+    @ApiParam("PSET2")
-    private String pest2;
+    private String pset2;
 
-    @Column(name = "PEST3")
+    @Column(name = "PSET3")
-    @ApiParam("PEST编码3")
+    @ApiParam("PSET3")
-    private String pest3;
+    private String pset3;
 
-    @Column(name = "PEST4")
+    @Column(name = "PSET4")
-    @ApiParam("PEST编码4")
+    @ApiParam("PSET4")
-    private String pest4;
+    private String pset4;
 
-    @Column(name = "PEST5")
+    @Column(name = "PSET5")
-    @ApiParam("PEST编码5")
+    @ApiParam("PSET5")
-    private String pest5;
+    private String pset5;
 
-    @Column(name = "PEST6")
+    @Column(name = "PSET6")
-    @ApiParam("PEST编码6")
+    @ApiParam("PSET6")
-    private String pest6;
+    private String pset6;
 
-    @Column(name = "PEST7")
+    @Column(name = "PSET7")
-    @ApiParam("PEST编码7")
+    @ApiParam("PSET7")
-    private String pest7;
+    private String pset7;
 
-    @Column(name = "PEST8")
+    @Column(name = "PSET8")
-    @ApiParam("PEST编码8")
+    @ApiParam("PSET8")
-    private String pest8;
+    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/MesStationBom.java

@@ -82,6 +82,14 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam(value = "匹配规则")
     private Integer matchRule;
 
+    @Column(name = "BIND_PART_TYPE")
+    @ApiParam(value = "绑定物料类型")
+    private Integer bindPartType = 20;
+
+    @Column(name = "FEED_WARNING_QTY")
+    @ApiParam(value = "投料预警值")
+    private Double feedWarningQty;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

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

@@ -50,6 +50,10 @@ public class MesWorkCellPoint extends BaseBean implements Serializable {
     @ApiParam("队列明细表序号")
     private Double queueDetailSeq;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0 : this.queueSeq;
     }

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

@@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("条码生成模式")
     private Integer generateType;
 
+    // 10=工单作业，20=标准作业
+    @Column(name = "MONITOR_TYPE")
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -74,6 +74,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("工单状态")
     private Integer workOrderStatus;
 
+    @Column(name = "IS_PULL")
+    @ApiParam("是否投料")
+    private Integer isPull = 2;
+
     @Column(name = "WO_TYPE")
     @ApiParam("工单类型")
     private Integer workOrderType;

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

@@ -31,11 +31,11 @@ import java.io.Serializable;
 public class MesWorkOrderLog extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5859382100462830988L;
 
-    @Column(name = "ORDER_NO")
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("工单号")
     private String orderNo;
 
-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
     @ApiParam("物料号")
     private String partNo;
 
@@ -154,7 +154,7 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -172,6 +172,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -60,6 +60,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("物料号")
     public String parentPartNo;
 
+    @ApiParam("是否封箱")
+    public Integer isSealed;
+
     public ProdPackModel() {
     }
 
@@ -77,4 +80,11 @@ public class ProdPackModel implements Serializable {
         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/RefreshInitModuleModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class RefreshInitModuleModel<T> implements Serializable {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+    @ApiParam("队列展示类型（有序/无序）")
+    private Object resultObj;
+
+    @ApiParam("展示组件定时刷新频率")
+    private Integer timer;
+
+    @ApiParam("List字段集")
+    private List<AttrBean> DataAttrList;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+}

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -58,6 +60,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户端信息")
     private String clientInfo;
 
+    @ApiParam("websocket session连接id")
+    private String sessionId;
+
     @ApiParam("用户信息")
     private String userInfo;
 
@@ -126,6 +131,7 @@ public class StationRequestBean implements Serializable {
     @ApiParam("当前流程状态")
     private MesStateMachineStatus curFsmState;
 
+    @JsonIgnore
     @ApiParam("展示组件")
     private Object moduleService;
 
@@ -141,9 +147,18 @@ public class StationRequestBean implements Serializable {
     @ApiParam("是否按时完成")
     private Integer isOnTimeComplete = 1;
 
+    @ApiParam("是否是调度程序调用")
+    private boolean isDispatcherInvoke;
+
     @ApiParam("工位剩余时间")
     private Long remainWorkTime;
 
+    @ApiParam("停机类型")
+    private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType;
+
+    @ApiParam("提醒时间点")
+    private Integer remindTime;
+
     @ApiParam("是否操作超时")
     private Integer isTimeOut = 2;
 
@@ -159,6 +174,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -22,6 +22,10 @@ public class StepDispatchModel {
 
     private String moduleDataMapKey;
 
+    private String pfKey;
+
+    private String dlKey;
+
     private String scanInfo;
 
     public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import io.swagger.annotations.Api;
 import lombok.Data;
 

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/7/21 00:33
+ * @desc
+ */
+@Data
+public class TimeModuleModel {
+
+    private MesPcnEnumUtil timeWay;
+
+    private Integer startTime;
+
+    private Integer endTime;
+
+    private Integer remindTime;
+
+    private String remindContent;
+
+    private String needTimeOutRecord;
+
+    private MesPlc agvRunningPlc;
+
+    private MesPlc mesWriteFlagPlc;
+
+    private MesPlc plcReadFlagPlc;
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: adair.song
+ * @CreateDate: 2020/07/25 14:21
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工位队列信息model")
+public class WorkCellPointInfoModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+}

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 条件封装
@@ -295,8 +296,15 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        }
         return packBean;
     }
 
@@ -309,13 +317,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
 
         return packBean;
@@ -1231,7 +1239,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
         }
         if (!StringUtils.isEmpty(numberRule.getPrefix())) {
-            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+            DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean);
         }
         if (null != numberRule.getIsCycle()) {
             DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
@@ -1344,7 +1352,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
-            DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
+            DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
         }
         if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@@ -1352,6 +1360,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
             DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean);
+        }
         return packBean;
     }
 
@@ -2043,7 +2057,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(),
@@ -2382,19 +2396,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;
@@ -2402,22 +2417,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;
@@ -2425,22 +2441,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;
@@ -2464,6 +2481,7 @@ public class MesHqlPack {
 
         return result;
     }
+
     /**
      * 封装公用查询参数
      *
@@ -2491,9 +2509,9 @@ public class MesHqlPack {
     }
 
 
-
     /**
      * 按条件分页查询产品条码补打印数据
+     *
      * @param mesProduceSn
      * @return
      */
@@ -2720,7 +2738,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());
@@ -2875,6 +2893,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板信息分页查询条件
+     *
      * @param template
      * @return
      */
@@ -2889,6 +2908,7 @@ public class MesHqlPack {
 
     /**
      * 导入模板明细信息分页查询条件
+     *
      * @param details
      * @return
      */
@@ -2951,6 +2971,7 @@ public class MesHqlPack {
 
     /**
      * 物料校验项
+     *
      * @param partCheck
      * @param organizeCode
      * @return
@@ -2996,6 +3017,7 @@ public class MesHqlPack {
 
     /**
      * MES AGV停机记录信息条件查询
+     *
      * @param stopRecord
      * @return
      */
@@ -3099,6 +3121,7 @@ public class MesHqlPack {
 
     /**
      * 扩展对象配置
+     *
      * @param extendObjectCfg
      * @param organizeCode
      * @return
@@ -3122,6 +3145,7 @@ public class MesHqlPack {
 
     /**
      * 产品工作中心配置
+     *
      * @param prodWorkCenter
      * @param organizeCode
      * @return
@@ -3139,6 +3163,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列
+     *
      * @param queueJitPlan
      * @param organizeCode
      * @return
@@ -3173,6 +3198,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列明细
+     *
      * @param queueJitPlanDetail
      * @param organizeCode
      * @return
@@ -3190,6 +3216,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT预装队列BOM
+     *
      * @param queueJitPlanBom
      * @param organizeCode
      * @return

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

@@ -54,4 +54,7 @@ public class MesElectricDataModel implements Serializable {
 
     @ApiParam(value = "FTP文件")
     private Object ftpFile;
+
+    @ApiParam(value = "过程条码")
+    private String serialNumber;
 }

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,42 @@ 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;
+
+    @ApiParam("防错码")
+    private String pokeYokeFix;
+
+    private Map<String, PsetModel> psets = new LinkedHashMap<>();
+
     /**
      * 大枪查询结果构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode
@@ -120,7 +161,8 @@ 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,
+                                 String pokeYokeFix) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -133,44 +175,64 @@ public class TorqueCollectionModel implements Serializable {
         this.yellowGunRule = yellowGunRule;
         this.isEndSeq = isEndSeq;
         this.groupCode = groupCode;
+        this.isPf = isPf;
+        this.qualifiedCount = qualifiedCount;
+        this.pokeYokeFix = pokeYokeFix;
     }
 
     /**
      * 小枪结果数据构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode
      * @param colorCode
      * @param partNo
      * @param partName
-     * @param pest1
+     * @param pset1
-     * @param pest2
+     * @param pset2
-     * @param pest3
+     * @param pset3
-     * @param pest4
+     * @param pset4
-     * @param pest5
+     * @param pset5
-     * @param pest6
+     * @param pset6
-     * @param pest7
+     * @param pset7
-     * @param pest8
+     * @param pset8
      * @param torqueNo
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
-                                 String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
+                                 String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
-                                 Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
+                                 Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
-                                 Integer torqueNo) {
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
         this.colorCode = colorCode;
         this.partNo = partNo;
         this.partName = partName;
-        this.pest1 = pest1;
+        this.pset1 = pset1;
-        this.pest2 = pest2;
+        this.pset2 = pset2;
-        this.pest3 = pest3;
+        this.pset3 = pset3;
-        this.pest4 = pest4;
+        this.pset4 = pset4;
-        this.pest5 = pest5;
+        this.pset5 = pset5;
-        this.pest6 = pest6;
+        this.pset6 = pset6;
-        this.pest7 = pest7;
+        this.pset7 = pset7;
-        this.pest8 = pest8;
+        this.pset8 = pset8;
         this.torqueNo = torqueNo;
+        this.sendSeq = sendSeq;
+        this.checkScanCount = checkScanCount;
+        this.pokeYokeFix = pokeYokeFix;
+        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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 任务单模型
@@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据业务类型代码")
     private String busiTypeCode;
 
+    @ApiParam(value = "关联单据业务类型代码集合")
+    private List<String> busiTypeCodeLst;
+
     @ApiParam(value = "计划日期")
     private String zdate;
 
@@ -107,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable {
         this.srcZoneNo = srcZoneNo;
         this.createUser = createUser;
     }
+
+    public WmsTaskInfoModel(String organizeCode, String busiTypeCode) {
+        this.organizeCode = organizeCode;
+        this.busiTypeCode = busiTypeCode;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -93,13 +95,22 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "是否系统邮件")
     private Integer isSystem;
 
+    @Column(name = "SEND_STATUS")
+    @ApiParam(value = "发送状态")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_SEND_STATUS.class)
+    private Integer sendStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
+
     @Transient
     @ApiParam(value = "阅读统计")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long readCount;
 
-    public long getReadCountVal(){
+    public long getReadCountVal() {
-        if(readCount == null){
+        if (readCount == null) {
             return 0;
         } else {
             return readCount.longValue();

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java

@@ -33,6 +33,7 @@ import java.util.List;
 public class SysRefRoleMenu extends BaseBean {
 
     private static final long serialVersionUID = -2013469818246101184L;
+
     @Column(name="MENU_ID")
     @ApiParam(value ="菜单ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -9,7 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean {
         }
         return taskPlanStatus.intValue();
     }
+
+    // 枚举 ImppEnumUtil.MESSAGE_TYPE
+    @Column(name = "LOG_LEVEL")
+    @ApiParam(value = "日志等级")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class)
+    private Integer logLevel;
+
+    public int getLogLevelVal() {
+        return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -467,15 +467,13 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
+        DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean);
-                ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
+        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false);
-                ddlPackBean);
-        DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
-                false, false);
         DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
         DdlPreparedPack.getOrderDefault(message);
 
@@ -508,17 +506,14 @@ public class CoreHqlPack {
      * @param sysTaskCycle
      * @return
      */
-    public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
+    public static DdlPackBean packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(sysTaskCycle);
 
         // hql拼接
-        HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
+        DdlPreparedPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
-        HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
-
-        // 添加默认排序
-        HqlPack.getOrderDefault(sysTaskCycle);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1144,4 +1139,14 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan);
+
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

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

@@ -47,8 +47,8 @@ public class IfPickData extends BaseBean implements Serializable {
     @ApiParam("物料编号")
     private String partNo;
 
-    @Column(name = "BIN位代码")
+    @Column(name = "BIN_NO")
-    @ApiParam("物料编号")
+    @ApiParam("BIN位代码")
     private String binNo;
 
     @Column(name = "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-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java

@@ -91,5 +91,8 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "适配请求文件列表")
     private List<BsSuitFile> bsSuitFileList;
 
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -149,5 +149,16 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配请求文件列表")
     private List<BsSuitFile> bsSuitFileList;
 
+    @Transient
+    @ApiParam(value = "适配记录报文-查询条件")
+    private String searchMessage;
+
+    @Transient
+    @ApiParam(value = "适配入参-查询条件")
+    private String searchInputParam;
+
+    @Transient
+    @ApiParam(value = "id-查询条件")
+    private List<Long> searchIdList;
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -318,6 +318,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
@@ -342,6 +343,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(bsSuitDataDetail.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
@@ -409,4 +411,12 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlBsLongData(BsLongData bsLongData){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsLongData);
+        DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+        DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean);
+        DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean);
+        return ddlPackBean;
+    }
 }

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

@@ -173,4 +173,19 @@ 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;
+
+    @Column(name = "JIS_NO")
+    @ApiParam(value = "jis编号")
+    private String jisNo;
+
+    public WmsDocFgDetail(String jisNo) {
+        this.jisNo = jisNo;
+    }
+
+    public WmsDocFgDetail() {
+    }
 }

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 String remake;
+
+    @Column(name = "SECONDARY_REMAKE")
+    @ApiParam(value = "备注2")
+    private String secondaryRemake;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

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/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,14 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "srcSn")
+    @ApiParam("原条码")
+    private String srcSn;
+
+    @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 = "SECONDARY_REMAKE")
+    @ApiParam(value = "备注2")
+    private String secondaryRemake;
+
+    @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,14 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    @ApiParam("发运单号")
+    @Column(name = "SHIPMENT_NOTE_NUMBER")
+    public String shipmentNoteNumber;
+
+    @ApiParam("erp单号")
+    @Column(name = "ERP_SRC_NO")
+    private String erpSrcNo;
+
     public WmsPOMaster() {
 
     }

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

@@ -60,6 +60,7 @@ public class WmsPackage extends BaseBean {
 
     @Column(name="PRINT_STATUS")
     @ApiParam(value = "打印状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class)
     public Integer printStatus;
 
     @Column(name="PACK_LEVEL")

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

@@ -40,8 +40,8 @@ public class WmsRfidOperateRecord extends BaseBean {
 
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE")
     public Integer operateType;
 
     @Column(name="SRC_LOCATE")

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

@@ -280,6 +280,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "包装零件号")
     private String packagePartNo;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam(value = "jis料架号")
+    private String queueGroupNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;
@@ -503,6 +507,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "颜色")
     private String color;
 
+    @Transient
+    @ApiParam(value = "单据")
+    private String orderNo;
+
     public WmsStockSn() {
     }
 
@@ -749,7 +757,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 color) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -797,6 +805,17 @@ public class WmsStockSn extends BaseBean {
         this.custNameRdd = custNameRdd;
         this.workOrderCode = workOrderCode;
         this.color = color;
+        this.orderNo = orderNo;
+    }
+
+    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/WmsTaskInfo.java

@@ -112,6 +112,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam("工厂集合")
     private List<String> organizeCodeList;
 
+    @Transient
+    @ApiParam("业务类型代码")
+    public String busiTypeCode;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){

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> {
+}