解决冲突

modules/i3plus-pojo-andon/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-aps/pom.xml

@@ -12,7 +12,6 @@
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -54,7 +53,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-base/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -71,7 +70,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 

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

@@ -18,7 +18,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
         WORK_ORDER_LANDED(10, "生产工单下达"),
-        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"),
+        MES_WORK_ORDER(30, "生产工单导入");
 
         private int value;
         private String description;
@@ -3052,7 +3053,8 @@ public class MesEnumUtil {
         ATTEMPT_ORDER(30, "试制工单"),
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
-        STOCK_ORDER(60, "库存工单");
+        STOCK_ORDER(60, "库存工单"),
+        REPAIR(70,"返修插单");
 
         private int value;
         private String description;

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

@@ -13,6 +13,41 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 监听任务明细-采集数据方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_DETAIL_COLLECT_TYPE {
+        SELF_ADDITION(10, "自增列"),
+        FEED_FIELD(20, "反馈字段");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_DETAIL_COLLECT_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;
+        }
+    }
+
+    /**
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2651,8 +2686,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC");
+        PLC(10, "PLC"),
-//        DB(20, "DB");
+        DB(20, "DB");
 
         private int value;
         private String description;

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

@@ -713,7 +713,8 @@ public class WmsEnumUtil {
         KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
-        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料");
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
 
         private int value;
         private String code;
@@ -4512,7 +4513,9 @@ public class WmsEnumUtil {
         SAFETY_STOCK_PULL(10, "安全库存拉动"),
         ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"),
         LINE_PULL(30, "巡线拉动"),
-        PLANNED_PULL(40, "计划拉动");
+        PLANNED_PULL(40, "计划拉动"),
+        ANDON_PULL(50, "安灯拉动"),
+        EXTERNAL_PULL(60, "手工拉动");
 
         private int value;
         private String description;
@@ -4551,6 +4554,53 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 尾数计算方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAIL_QTY_MODE {
+        NONE(1, "不处理"),
+        ORIGIN_NUMBER(10, "原数值"),
+        UP_ROUND(20, "向上取整"),
+        DOWN_ROUND(30, "向下取整");
+
+        private int value;
+        private String description;
+
+        TAIL_QTY_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TAIL_QTY_MODE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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)
@@ -5307,48 +5357,82 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RULE {
-        IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10),
+        IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10,
-        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10),
+                0, "isSameCustomer", "同客户"),
-        IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10),
+        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10,
-        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10),
+                0, "isSameWareHouse", "同仓库"),
-        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10),
+        IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10,
-        IS_SAME_PART("同物料", "isSamePart", 2, 10),
+                0, "isSamePriority", "同优先级"),
-        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10),
+        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10,
-        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10),
+                0, "isSameSrcZone", "同来源存储区"),
-        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10),
+        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10,
-        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10),
+                0, "isSameDestZone", "同目标存储区"),
-        IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10),
+        IS_SAME_PART("同物料", "isSamePart", "2", 10,
-        IS_COLLECTION("物料整箱归集", "isCollection", 2, 10);
+                0, "isSamePart", "同物料"),
+        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10,
+                0, "isSamePartGroup", "同物料组"),
+        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10,
+                0, "isSameDeliveryTime", "同发货时间"),
+        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10,
+                0, "isSameBusiType", "同业务类型"),
+        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10,
+                0, "isSameOrderStatus", "同单据状态"),
+        IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10,
+                0, "isCrossArea", "允许跨区"),
+        IS_COLLECTION("物料整箱归集", "isCollection", "2", 10,
+                0, "isCollection", "物料整箱归集");
+
+        private String fieldChName;
+
+        private String fieldEnName;
+
+        private int mergeOperatorType;
+
+        private String fieldValue;
 
-        private String chName;
+        private int value;
-
-        private String enName;
 
-        private int waveMergeType;
+        private String code;
 
-        private int value;
+        private String description;
 
-        WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) {
+        WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value,
-            this.chName = chName;
+                        String code, String description) {
-            this.enName = enName;
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
+            this.fieldValue = fieldValue;
+            this.mergeOperatorType = mergeOperatorType;
             this.value = value;
-            this.waveMergeType = waveMergeType;
+            this.description = description;
+            this.code = code;
         }
 
-        public String getChName() {
+        public String getFieldChName() {
-            return chName;
+            return fieldChName;
         }
 
-        public String getEnName() {
+        public String getFieldEnName() {
-            return enName;
+            return fieldEnName;
         }
 
-        public int getValue() {
+        public String getFieldValue() {
-            return value;
+            return fieldValue;
+        }
+
+        public int getMergeOperatorType() {
+            return mergeOperatorType;
         }
 
-        public int getWaveMergeType() {
+        public String getDescription() {
-            return waveMergeType;
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public int getValue() {
+            return value;
         }
     }
 
@@ -5358,28 +5442,35 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RANGE {
         CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
-                "custNo, custName", "custNo, custName", "custNo", 20),
+                "custNo,custName", "custNo,custName", "custNo",
+                20, "", "custNo", 0, "客户代码"),
         WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-                "code, name", "code, name", "code", 20),
+                "code,name", "code,name", "code",
+                20, "", "srcWhNo", 0, "仓库代码"),
         PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
-                "", "", 20),
+                "", "", 20, "",
+                "priority", 0, "优先级"),
         SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-                "zoneNo, zoneName", "zoneNo", "zoneNo", 20),
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
+                20, "", "srcZoneNo", 0, "来源存储区代码"),
         DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-                "zoneNo, zoneName", "zoneNo", "zoneNo", 20),
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
+                20, "", "destZoneNo", 0, "目标存储区代码"),
         PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
-                "partNo, partName", "partNo", "partNo", 20),
+                "partNo,partName", "partNo", "partNo",
-        PART_GROUP_NO("物料组代码", "partGroupNo", "", "",
+                20, "", "partNo", 0, "物料号"),
-                "", "", 20),
+        PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
+                "partGroupNo,partGroupName", "partGroupNo",
+                "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"),
         BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
-                "", "", 20),
+                "", "", 20, "", "busiType", 0, "业务类型"),
         ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "",
-                "", "", 20);
+                "", "", 20, "", "orderStatus", 0, "单据状态");
 
         // 中文名称
-        String chName;
+        String fieldChName;
         // 英文名称
-        String enName;
+        String fieldEnName;
         // 下拉枚举名称
         String entityName;
         // 下拉列表显示列名称,多个列名需要根据逗号分隔
@@ -5389,25 +5480,38 @@ public class WmsEnumUtil {
         // 回显列名
         String explicitColumnName;
         // 合并操作类型
-        private int waveMergeType;
+        private int mergeOperatorType;
 
-        WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
+        private String fieldValue;
-                         String searchColumnName, String explicitColumnName, int waveMergeType) {
+
-            this.chName = chName;
+        private int value;
-            this.enName = enName;
+
+        private String code;
+
+        private String description;
+
+        WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName,
+                         String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue,
+                         String code, int value, String description) {
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
             this.entityName = entityName;
             this.listColumnName = listColumnName;
             this.searchColumnName = searchColumnName;
             this.explicitColumnName = explicitColumnName;
-            this.waveMergeType = waveMergeType;
+            this.mergeOperatorType = mergeOperatorType;
+            this.fieldValue = fieldValue;
+            this.code = code;
+            this.value = value;
+            this.description = description;
         }
 
-        public String getChName() {
+        public String getFieldEnName() {
-            return chName;
+            return fieldEnName;
         }
 
-        public String getEnName() {
+        public String getFieldChName() {
-            return enName;
+            return fieldChName;
         }
 
         public String getEntityName() {
@@ -5426,8 +5530,24 @@ public class WmsEnumUtil {
             return explicitColumnName;
         }
 
-        public int getWaveMergeType() {
+        public int getMergeOperatorType() {
-            return waveMergeType;
+            return mergeOperatorType;
+        }
+
+        public String getFieldValue() {
+            return fieldValue;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return "description";
+        }
+
+        public String getCode() {
+            return code;
         }
     }
 
@@ -5490,4 +5610,291 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 存储区-补货方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ZONE_PULL_WAY {
+        JOB_CYCLE(10, "JOB周期"),
+        FIXED_CYCLE(20, "固定周期");
+
+        private int value;
+        private String description;
+
+        ZONE_PULL_WAY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static ZONE_PULL_WAY codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 拉动任务-任务类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_TYPE {
+        NORMAL_PULL(10, "普通拉动"),
+        GROUP_PULL(20, "组合拉动");
+
+        private int value;
+        private String description;
+
+        PULL_TASK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PULL_TASK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 道口预约订单状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_ORDER_STATUS {
+        WAIT_SEND(10, "待送货"),
+        ARRIVED(20, "已到达"),
+        RECEIVED(30, "已收货"),
+        CANCELED(40, "已取消");
+
+        private int value;
+        private String description;
+
+        DOCK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_ORDER_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 道口预约订单状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_APPOINTMENT_STATUS {
+        WAIT_SEND(10, "待送货"),
+        HAS_SENDED(20, "已送达"),
+        RECEIVING(30, "收货中"),
+        COMPLETED(40, "已完成"),
+        OVERTIME(50, "供货超时");
+
+        private int value;
+        private String description;
+
+        DOCK_APPOINTMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_APPOINTMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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 QAD_DOC_TYPE {
+        TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
+
+        private int value;
+        private String code;
+        private String description;
+
+        public String getCode() {
+            return code;
+        }
+
+        QAD_DOC_TYPE(int value,String code,  String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public 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;
+        }
+    }
+
+
+    /**
+     * 业务场景Supplier
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BUSI_SCENE_TYPE {
+        YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"),
+        TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"),
+        ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"),
+        SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"),
+        CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提");
+        private int value;
+        private String code;
+        private String description;
+
+        BUSI_SCENE_TYPE(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 BUSI_SCENE_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
 
@@ -51,6 +50,6 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 </project>

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -179,6 +179,7 @@ public final class FormHqlPack {
 
         DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
         ddlPackBean.setOrderByStr(bfIntercept.orderBy());
@@ -324,6 +325,9 @@ public final class FormHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean);
 
@@ -383,4 +387,33 @@ public final class FormHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据对象查询条件拼接
+     * @param bfDataObject
+     * @return
+     */
+    public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+
+    /**
+     * 数据对象查询条件拼接
+     * @param bfCascade
+     * @return
+     */
+    public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <profiles>
         <profile>
@@ -44,7 +43,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <profiles>
         <profile>
@@ -44,7 +43,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-lac/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -73,6 +73,7 @@ public class LacHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -163,6 +164,10 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+        DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
+
+
         return ddlPackBean;
     }
 
@@ -190,4 +195,14 @@ public class LacHqlPack {
         DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

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

@@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable {
         this.snStatus = snStatus;
         this.workType = workType;
     }
+    public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+    }
 }

modules/i3plus-pojo-mes/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

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

@@ -70,6 +70,14 @@ public class MesDataObject extends BaseBean implements Serializable {
     @ApiParam("自增列值")
     private Long selfAdditionValue;
 
+    @Column(name = "ORDER_BY_FIELD")
+    @ApiParam("采集排序字段")
+    private String orderbyField;
+
+    @Column(name = "ORDER_BY_VALUE")
+    @ApiParam("采集排序值")
+    private Integer orderbyValue;
+
     @Transient
     @ApiParam("操作类型名称")
     private String operateTypeName;

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

@@ -38,13 +38,13 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable {
     @ApiParam("数据对象编号")
     private String dataObjectNo;
 
-//    @Column(name = "STORE_OBJECT_CODE")
+    @Column(name = "STORE_OBJECT_CODE")
-//    @ApiParam("存储对象代码")
+    @ApiParam("存储对象代码")
-//    private String storeObjectCode;
+    private String storeObjectCode;
-//
+
-//    @Column(name = "STORE_FIELD_CODE")
+    @Column(name = "COLLECT_TYPE")
-//    @ApiParam("存储字段代码")
+    @ApiParam("采集数据方式")
-//    private String storeFieldCode;
+    private Integer collectType;
 
     @Transient
     @ApiParam("任务名称")

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

@@ -20,6 +20,9 @@ public class ButtonComponentResultModel {
     @ApiParam("成功信号")
     private boolean isSuccess;
 
+    @ApiParam("是否跳过工序")
+    private boolean isJumpProcess;
+
     @ApiParam("提示信息")
     private String msg;
 

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
+//import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
     public MesPlcModel() {
 
     }
@@ -99,7 +103,7 @@ 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 workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable {
         this.isAnalysis = isAnalysis;
         this.device = device;
         this.objectCode = objectCode;
+        this.opcUrl = opcUrl;
     }
 }

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+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;
+
+/**
+ * @Description :MES_JIT发运队列
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING")
+@Api("MES_JIT发运队列")
+public class MesQueueShipping extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 655875369308414110L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+}

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+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;
+
+/**
+ * @Description :MES_JIT发运队列明细
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
+@Api("MES_JIT发运队列明细")
+public class MesQueueShippingDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1442091799346314190L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "status")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Double qty;
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("产品生产类型")
+    private String pptCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置参数Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgParamModel {
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
+
+    List<MesRouteCfgStepModel> stepModelList;
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgStepModel {
+
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    List<MesRouteCfgModel> routeCfgModelList;
+}

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

@@ -120,7 +120,39 @@ public class QueueOrderModel implements Serializable {
         this.snStatus = snStatus;
         this.workType = workType;
     }
+    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snStatus = snStatus;
+        this.workType = workType;
+        this.finsihQty=finsihQty;
+        this.qty=qty;
+        this.orderNo=orderNo;
+    }
 
+    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snStatus = snStatus;
+        this.workType = workType;
+        this.orderNo=orderNo;
+    }
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
@@ -129,16 +161,33 @@ public class QueueOrderModel implements Serializable {
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
     }
+    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                            String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.finsihQty=finsihQty;
+        this.qty=qty;
+        this.orderNo=orderNo;
+    }
 
-    public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
+    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+                           String partNo, String partNameRdd, String workType) {
-        this.queueGroupNo = queueGroupNo;
+        this.id = id;
-        this.groupNo = groupNo;
-        this.orderNo = orderNo;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
-        this.organizeCode = organizeCode;
+        this.workType = workType;
+        this.orderNo=orderNo;
     }
 }

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable {
     private String queueGroupNo;
 
     @ApiParam("数据map")
-    private Map<String, Object> dataMap;
+    private Map<String, Object> dataMap=new HashMap<>();
 
     @ApiParam("流程状态集合")
     private List<MesRouteStatus> routeStatusList;

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

@@ -20,13 +20,16 @@ public class StepDispatchModel {
 
     private String requestBeanKey;
 
+    private String moduleDataMapKey;
+
     private String scanInfo;
 
-    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) {
+    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
         this.stepListKey = stepListKey;
         this.firstScanKey = firstScanKey;
         this.cellParamKey = cellParamKey;
         this.requestBeanKey = requestBeanKey;
+        this.moduleDataMapKey = moduleDataMapKey;
         this.scanInfo = scanInfo;
     }
 }

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

@@ -1079,6 +1079,9 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
+        if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
         }

modules/i3plus-pojo-model/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -91,7 +90,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-platform/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

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

@@ -306,18 +306,19 @@ public class CoreHqlPack {
      * @param config
      * @return
      */
-    public static String packHqlSysConfig(SysConfig config) {
+    public static DdlPackBean   packHqlSysConfig(SysConfig config) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(config.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
-        HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
+        DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
-        HqlPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(config);
+        DdlPreparedPack.getOrderDefault(config);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -337,7 +338,8 @@ public class CoreHqlPack {
             DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
         }
         DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
-        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
 
         // 添加默认排序
         DdlPreparedPack.getOrderDefault(dictionary);
@@ -407,7 +409,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
 
-        ddlPackBean.setOrderByStr(message.orderBy());
+        DdlPreparedPack.getOrderDefault(message);
 
         return  ddlPackBean;
     }
@@ -417,19 +419,21 @@ public class CoreHqlPack {
      * @param file
      * @return
      */
-    public static String packHqlSysFile(SysFile file) {
+    public static DdlPackBean packHqlSysFile(SysFile file) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
+        DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result);
-        HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
+        DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result);
-        HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
+        DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result);
-        HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
+        DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result);
+        DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
+        DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(file);
+        DdlPreparedPack.getOrderDefault(file);
 
-        return  result.toString();
+        return  result;
     }
 
     /**
@@ -455,20 +459,22 @@ public class CoreHqlPack {
      * @param sysTaskPlan
      * @return
      */
-    public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
+    public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
-        HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
-        HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
+        DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(sysTaskPlan);
+        DdlPreparedPack.getOrderDefault(sysTaskPlan);
 
-        return  result.toString();
+        return  result;
     }
 
     /**
@@ -738,18 +744,23 @@ public class CoreHqlPack {
      * @param orderNoRule
      * @return
      */
-    public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
+    public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
-        StringBuffer result =  new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
-        HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
-        HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
+        if (orderNoRule.getSerialNo() != null) {
+            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result);
+        }
 
         // 添加默认排序
-        HqlPack.getOrderDefault(orderNoRule);
+        DdlPreparedPack.getOrderDefault(orderNoRule);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -779,13 +790,18 @@ public class CoreHqlPack {
      * @param sysTask
      * @return
      */
-    public static String packHqlSysTask(SysTask sysTask){
+    public static DdlPackBean packHqlSysTask(SysTask sysTask){
-        StringBuffer result =  new StringBuffer();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean();
 
-        HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
-        HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);
 
-        return result.toString();
+        DdlPreparedPack.getOrderDefault(sysTask);
+
+        return result;
     }
 
     public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){

modules/i3plus-pojo-ptl/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,6 +49,6 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 </project>

modules/i3plus-pojo-report/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
 
@@ -51,6 +50,6 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 </project>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
 
@@ -51,6 +50,6 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 </project>

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

@@ -68,11 +68,13 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "获取报文时间")
     private String getDateTime;
 
+    // 移动至记录数据表
     @Lob
     @Column(name = "ORGIN_DATA")
     @ApiParam(value = "原始报文数据")
     private String orginData;
 
+    // 移动至记录数据表
     @Lob
     @Column(name = "TRANS_DATA")
     @ApiParam(value = "转换后的报文数据")

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

@@ -90,6 +90,7 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "认证结果")
     private Integer suitSslKeyResult;
 
+    // 移动至记录数据表
     @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE")
     @ApiParam(value = "认证信息")
     private String suitSslKeyResultMessage;
@@ -111,6 +112,7 @@ public class BsSuitRecord extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long executeTime;
 
+    // 移动至记录数据表
     @Lob
     @Column(name = "SUIT_MESSAGE")
     @ApiParam(value = "适配信息")

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

@@ -44,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean {
     @ApiParam(value = "请求来源(枚举)")
     private Integer requestSource;
 
+    // 移动至记录数据表
     @Lob
     @Column(name = "REQUEST_ORGIN_PARAM")
     @ApiParam(value = "请求原始参数")

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

@@ -325,6 +325,8 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
 
@@ -343,6 +345,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);

modules/i3plus-pojo-sweb/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-wms/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -54,7 +53,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

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

@@ -89,6 +89,10 @@ public class BasVendor extends BaseBean{
     @Column(name = "VENDOR_TYPE")
     private Integer vendorType;
 
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
     public BasVendor() {
     }
 

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

@@ -52,6 +52,10 @@ public class MesPpDetails extends BaseBean{
     @ApiParam(value = "工单数量", example = "0")
     public Double qty;
 
+    @Column(name="PART_GROUP_NO")
+    @ApiParam("零件组号")
+    public String partGroupNo;
+
     public Integer getItem() {
         return item == null ? 0 : this.item.intValue();
     }

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

@@ -58,6 +58,10 @@ public class MesPpMaster extends BaseBean{
     @ApiParam(value = "单据状态", example = "0")
     private Integer orderStatus = 0;
 
+    @Column(name="SEQ")
+    @ApiParam(value = "排序号", example = "0")
+    private Integer seq = 0;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }

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

@@ -68,6 +68,10 @@ public class WareHouse extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double baseUnit;
 
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
     @Transient
     @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;

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

@@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
+    @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
+    @ApiParam("道口")
+    public String dock;
+
     @Transient
     @ApiParam("供应商电话")
     private String vendorCall;

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

@@ -61,4 +61,8 @@ public class WmsCar extends BaseBean {
     @Transient
     @ApiParam(value = "供应商名称")
     private String vendorNameRdd;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
 }

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

@@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "车牌号")
     private String carNo;
 
+    @Column(name = "DRIVER_NO")
+    @ApiParam("司机")
+    public String driverNo;
+
     @Column(name = "CUST_ORDER_NO")
     @ApiParam(value = "客户单号")
     private String custOrderNo;

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 : 道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK")
+@Api("道口预约信息")
+public class WmsDock extends BaseBean {
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="DOCK_ADDRESS")
+    @ApiParam("道口发运地址")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockAddress;
+
+    @Column(name="DOCK_DESC")
+    @ApiParam("道口发运地址描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockDesc;
+
+    @Column(name="DOCK_TYPE")
+    @ApiParam("道口类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockType;
+}

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

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 : 道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_ORDER_INFO")
+@Api("道口预约信息")
+public class WmsDockOrderInfo extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="ORDER_DATE")
+    @ApiParam("预约日期")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String orderDate;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam("预约状态")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS")
+    private Integer orderStatus;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String supplierCode;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车辆编号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String carNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam("驾驶员")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String driverName;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 : 道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_WINDOW_TIME")
+@Api("道口窗口时间")
+public class WmsDockWindowTime extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String dockCode;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+}

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

@@ -62,6 +62,10 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam(value = "安全库存", example = "0")
     private Double safetyStock;
 
+    @Column(name = "MOQ", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "起订量", example = "0")
+    private Double moq;
+
     @Transient
     @ApiParam("库位类型")
     private Integer locateType;

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

@@ -244,6 +244,11 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "拉动方式")
     private String pullWay;
 
+    @Column(name = "TAIL_QTY_MODE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    @ApiParam(value = "尾数计算方式", example = "1")
+    private Integer tailQtyMode;
+
     @Column(name = "CYCLE_RQUEST_PERIOD")
     @ApiParam(value = "循环补货周期", example = "0")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description 拉动规则实体
+ * @Author Jason
+ * @Date 2020-03-20
+ * @ModifyDate 2020-03-20
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PULL_RULE")
+@Api("拉动规则")
+public class WmsPullRule extends BaseBean {
+    @Column(name = "PULL_WAY")
+    @ApiParam(value = "拉动类型", example = "10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PULL_WAY_STATUS")
+    private Integer pullWay;
+
+    @Column(name = "CONTAIN_UNFINISH_ORDER")
+    @ApiParam(value = "考虑未完成的移库单", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    private Integer containUnfinishOrder;
+
+    @Column(name = "CONTAIN_EXIST_PERIOD")
+    @ApiParam(value = "考虑现有库存", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
+    private Integer containExistStock;
+
+    @Column(name = "TAIL_QTY_MODE")
+    @ApiParam(value = "尾数计算方式", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TAIL_QTY_MODE")
+    private Integer tailQtyMode;
+}

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

@@ -110,6 +110,10 @@ public class WmsPullTaskDetails extends BaseBean{
     @ApiParam(value = "明细状态", example = "0")
     private Integer orderStatus = 0;
 
+    @Column(name="PART_GROUP_NO")
+    @ApiParam("零件组号")
+    public String partGroupNo;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }

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

@@ -62,6 +62,14 @@ public class WmsPullTaskMaster extends BaseBean{
     @ApiParam(value = "是否暂停", example = "0")
     private Integer isSuspend = 2;
 
+    @Column(name="PULL_TASK_TYPE")
+    @ApiParam(value = "拉动任务类型", example = "10")
+    private Integer pullTaskType;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "排序号", example = "0")
+    private Integer seq;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }

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

@@ -0,0 +1,91 @@
+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.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.*;
+import java.util.List;
+
+
+/**
+ * @Description : 运输规则表
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-03-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TRANSPORT_RULE")
+@Api("运输规则表")
+public class WmsTransportRule extends BaseBean {
+    private static final long serialVersionUID = 6120257805546343124L;
+
+    @Column(name = "COMMAND_TYPE")
+    @ApiParam(value = "指令类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description")
+    private String commandType;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE")
+    public Integer busiType;
+
+    @Column(name = "BUSI_SCENE_TYPE")
+    @ApiParam("业务场景")
+    //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
+    public Integer busiSceneType;
+
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("发货库存地")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String srcAreaNo;
+
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String destAreaNo;
+
+    @Column(name = "OUT_VENDOR_NO")
+    @ApiParam("委外供应商编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String outVendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String partNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    public String custNo;
+
+    @Column(name = "IS_TRANSPORT")
+    @ApiParam("是否安排运输")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
+    public int isTransport;
+
+    @Column(name = "REMARK",length = 255)
+    @ApiParam("备注")
+    public String remark;
+
+    @ApiParam("物料编码")
+    @Transient
+    public List<String> partNoLst;
+}

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

@@ -50,6 +50,22 @@ public class WmsWaveRuleDetails extends BaseBean {
     @ApiParam(value = "字段值")
     public String fieldValue;
 
+    @Column(name = "ENTITY_NAME")
+    @ApiParam(value = "实例类名")
+    public String entityName;
+
+    @Column(name = "LIST_COLUMN_NAME")
+    @ApiParam(value = "列表列名")
+    public String listColumnName;
+
+    @Column(name = "SEARCH_COLUMN_NAME")
+    @ApiParam(value = "搜索列名")
+    public String searchColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    public String explicitColumnName;
+
     public Long getRuleId() {
         return ruleId == null ? 0L : ruleId.longValue();
     }

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

@@ -117,6 +117,21 @@ public class WmsZones extends BaseBean {
     @ApiParam(value = "三维位置")
     private String position;
 
+    @Column(name = "ZONE_PULL_WAY")
+    @ApiParam(value = "补货方式", example = "10")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "ZONE_PULL_WAY")
+    private Integer zonePullWay;
+
+    @Column(name = "PULL_CYCLE")
+    @ApiParam(value = "固定拉动周期", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer pullCycle;
+
+    @Column(name = "LAST_PULL_TIME")
+    @ApiParam(value = "上次拉动时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    private String lastPullTime;
+
     @Transient
     @ApiParam(value = "子存储区列表")
     private List<WmsZones> childList;

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 道口看板数据模型
+ * @author jason.niu
+ * @date 2020/03/31
+ */
+@Data
+@Api("道口看板数据模型")
+public class DockDashboardModel {
+    @ApiParam("预约时间")
+    private String orderDate;
+
+    @ApiParam("预约状态")
+    private Integer appointmentStatus;
+
+    @ApiParam("供应商编码")
+    private String supplierCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("车牌号")
+    private String carNo;
+
+    @ApiParam("驾驶员")
+    private String driverName;
+}

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

@@ -84,4 +84,7 @@ public class WmsDocMovementModel {
 
     @ApiParam(value = "一步法/两步法")
     private Integer isSingleStep;
+
+    @ApiParam(value = "创建时间")
+    private String createDateTime;
 }

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 外部拉动数据结构
+ * @author jason.niu
+ * @date 2020/03/25
+ */
+@Data
+@Api("外部拉动单模型")
+public class WmsPullOrderModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("产线")
+    private String lineNo;
+
+    @ApiParam("仓库代码")
+    public String WhNo;
+
+    @ApiParam("存储区代码")
+    public String ZoneNo;
+
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @ApiParam("库位")
+    private String locateNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    public String partName;
+
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("单位")
+    public String unit;
+
+    @ApiParam("批次")
+    public String lotNo;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.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.WmsDockOrderInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockOrderInfoRepository extends BaseRepository<WmsDockOrderInfo, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.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.WmsDock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-30
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockRepository extends BaseRepository<WmsDock, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.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.WmsDockWindowTime;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockWindowTimeRepository extends BaseRepository<WmsDockWindowTime, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPullRuleRepository.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.WmsPullRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :拉动规则Repository的方法接口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-23 15:38
+ * @Modify:
+ **/
+@Repository
+public interface WmsPullRuleRepository extends BaseRepository<WmsPullRule, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.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.WmsTransportRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 运输规则dao层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-03-27 10:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsTransportRuleRepository extends BaseRepository<WmsTransportRule, Long> {
+}

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

@@ -559,6 +559,22 @@ public class WmsHqlPack {
     }
 
     /**
+     * 拉动规则  分页查询
+     * @param rule
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPullRule(WmsPullRule rule) {
+        //查询参数封装
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getNumEqualPack(rule.getPullWay(), "pullWay", result);
+
+        getStringBuilderPack(rule, result);
+        return result;
+    }
+
+    /**
      * 根据类型查询库位分页
      *
      * @param wmsLocate
@@ -2885,10 +2901,24 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result);
+        DdlPreparedPack.getStringEqualPack(rule.getRuleDesc(), "ruleDesc", result);
         DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result);
         DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result);
         getStringBuilderPack(rule, result);
         return result;
     }
 
+    /**
+     * 运输规则分页查询条件
+     * @param wmsTransportRule
+     * @return
+     */
+    public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result);
+        getStringBuilderPack(wmsTransportRule, result);
+        return result;
+    }
 }

modules/i3plus-pojo-workflow/pom.xml

@@ -5,15 +5,13 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
-
 
     <profiles>
         <profile>
@@ -45,7 +43,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-${profileActive}-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
@@ -77,23 +77,23 @@
         <dependencies>
 
             <dependency>
-                <groupId>i3plus.platform</groupId>
+                <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-platform-common</artifactId>
+                <artifactId>i3plus-pojo-base</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+
             <dependency>
-                <groupId>i3plus.pojo</groupId>
+                <groupId>i3plus.platform</groupId>
-                <artifactId>i3plus-pojo-model</artifactId>
+                <artifactId>i3plus-platform-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-base</artifactId>
+                <artifactId>i3plus-pojo-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-mes</artifactId>
@@ -202,24 +202,24 @@
     </distributionManagement>
 
     <!--<build>-->
-        <!--<plugins>-->
+    <!--<plugins>-->
-            <!--<plugin>-->
+    <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
+    <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+    <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-            <!--</plugin>-->
+    <!--</plugin>-->
 
-            <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+    <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
-            <!--<plugin>-->
+    <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
+    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+    <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<version>3.5.1</version>-->
+    <!--<version>3.5.1</version>-->
-                <!--<configuration>-->
+    <!--<configuration>-->
-                    <!--<source>1.8</source>-->
+    <!--<source>1.8</source>-->
-                    <!--<target>1.8</target>-->
+    <!--<target>1.8</target>-->
-                    <!--<encoding>UTF-8</encoding>-->
+    <!--<encoding>UTF-8</encoding>-->
-                <!--</configuration>-->
+    <!--</configuration>-->
-            <!--</plugin>-->
+    <!--</plugin>-->
-        <!--</plugins>-->
+    <!--</plugins>-->
     <!--</build>-->
     <profiles>
         <profile>
@@ -251,7 +251,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>