Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -5357,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 String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
         }
 
-        public int getWaveMergeType() {
+        public int getValue() {
-            return waveMergeType;
+            return value;
         }
     }
 
@@ -5408,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;
         // 下拉列表显示列名称,多个列名需要根据逗号分隔
@@ -5439,25 +5480,38 @@ public class WmsEnumUtil {
         // 回显列名
         String explicitColumnName;
         // 合并操作类型
-        private int waveMergeType;
+        private int mergeOperatorType;
+
+        private String fieldValue;
+
+        private int value;
+
+        private String code;
 
-        WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
+        private String description;
-                         String searchColumnName, String explicitColumnName, int waveMergeType) {
+
-            this.chName = chName;
+        WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName,
-            this.enName = enName;
+                         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() {
@@ -5476,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;
         }
     }
 
@@ -5676,6 +5746,16 @@ public class WmsEnumUtil {
             }
             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;
+        }
     }
 
     /**
@@ -5715,7 +5795,99 @@ public class WmsEnumUtil {
             return null;
         }
 
-        public static String valueOf(int val) {
+        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) {

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

@@ -2901,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;
+    }
 }

pom.xml

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