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

# Conflicts:
#	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
#	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java

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

@@ -947,12 +947,12 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 111020005, "物料"),
-        QUALITY("QUALITY_ALARM", 111020006, "质量"),
-        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
-        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "自处理"),
-        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
+        PART("PART_ALARM", 110060104, "物料"),
+        QUALITY("QUALITY_ALARM", 110060105, "质量"),
+        EQUIP("EQUMENT_ALARM", 110060106, "设备"),
+        PROCESS("ROUTING_ALARM", 110060107, "工艺"),
+        CHECK("OTHER_ALARM", 110060108, "自处理"),
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警");
 
         private String value;
         private Integer code;

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

@@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        TRUE_OR_FALSE(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;
+        }
+    }
+
     /**
      * 包装规格-是否混包 MES_PACK_SPEC
      * 10.
@@ -172,7 +204,9 @@ public class MesEnumUtil {
             this.description = description;
         }
 
-        public String getValue() { return value;}
+        public String getValue() {
+            return value;
+        }
 
         public String getDescription() {
             return description;
@@ -1333,7 +1367,11 @@ public class MesEnumUtil {
         MES_DATA_OBJECT(220, "数据对象"),
         MES_OBJECT_CFG(230, "对象结构"),
         MES_WC_CHECK(240, "开线检查"),
-        MES_QC_CHECK_STANDARD(250, "质量检测标准");
+        MES_QC_CHECK_STANDARD(250, "质量检测标准"),
+        MES_FAULT_CAUSE(260,"设备故障原因"),
+        MES_FAULT_METHOD(270,"设备故障处理措施"),
+        MES_FAULT_PHENOMENON(280,"设备故障现象");
+
 
         private int value;
         private String description;

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

@@ -1180,7 +1180,7 @@ public class MesPcnEnumUtil {
         MATERIAL(30, "materials", "物料"),
         ROUTE(40, "routes", "工艺"),
         ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
-        MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
+        ENVIRONMENT(60, "environment", "环境");
 
 
         private int value;

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

@@ -368,7 +368,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
-        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"),CREATE_DOCMOVE(40, "生成移库单"),PULL_FAIL(50, "拉动出错");
+        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"), CREATE_DOCMOVE(40, "生成移库单"), PULL_FAIL(50, "拉动出错");
 
         private int value;
         private String description;
@@ -638,14 +638,15 @@ public class WmsEnumUtil {
         KT_REWORK(380, "KT_REWORK", "KT返工"),
         KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
         KT_SORTING(400, "KT_SORTING", "KT分选"),
-		VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
-		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
-		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
-        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
+        VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
+        VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
+        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
+        KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
-        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
 
         private int value;
         private String code;
@@ -826,8 +827,8 @@ public class WmsEnumUtil {
         VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
         VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"),
         VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
-        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
-		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
+        VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
+        VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
         private String value;
@@ -904,14 +905,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
-        , CLOSE(40, "已关闭");
+        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
+        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
+        private int code;
         private String description;
 
-        TASK_INFO_STATUS(int value, String description) {
+        TASK_INFO_STATUS(int value, int code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -919,6 +922,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public int getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -936,13 +943,25 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-    }
 
+        public static TASK_INFO_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 
 
     /**
      * 业务表：库存条码状态
-     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
+     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -952,7 +971,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        SCRAP(70, "报废"),
+        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -995,6 +1014,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1052,12 +1072,14 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 业务表：库存条码质检状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
 
         private int value;
         private String code;
@@ -1363,7 +1385,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 质检业务状态
      */
@@ -1436,6 +1457,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 质检业务类型
      */
@@ -1476,6 +1498,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 作业记录参数状态
      */
@@ -2339,13 +2362,14 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * NC处理 操作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BUSI_OPERATION_TYPE {
         //收货改数
-        GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ;
+        GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数");
 
         private int value;
         private String code;
@@ -2854,9 +2878,8 @@ public class WmsEnumUtil {
     }
 
 
-
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
 
         private String value;
         private String description;
@@ -4086,7 +4109,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SPEC_LEVEL {
-        FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"),  FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
+        FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层");
 
         private int value;
         private String description;
@@ -4281,4 +4304,97 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RECEIVING_GOODS_STATUS {
+        WAIT_RECEIVING(10, "待收货"),
+        RECEIVING(20, "收货中"),
+        COMPLETE_RECEIVING(30, "收货完成"),
+        UN_RECEIVED(40, "延迟未收货"),
+        ELSE(50,"其他");
+
+        private int value;
+        private String description;
+
+        RECEIVING_GOODS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static RECEIVING_GOODS_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;
+        }
+    }
+
+    /**
+     * 发运看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINAL_SHIPMENT_STATUS {
+        CREATE(10, "新建"),
+        PROCESSING(20, "处理中"),
+        COMPLETE(30, "已完成");
+
+        private int value;
+        private String description;
+
+        FINAL_SHIPMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static FINAL_SHIPMENT_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;
+        }
+    }
+
+
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION")
+@Api("mes系统业务动作")
+public class MesAction extends BaseBean {
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_NAME")
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("动作类型")
+    private Integer actionType;
+
+    public int getActionTypeVal() {
+        return this.actionType == null ? 0 : this.actionType;
+    }
+}

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION_METHOD")
+@Api("系统业务动作方法")
+public class MesActionMethod extends BaseBean {
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ESOP")
+@Api("作业指导书信息表(ODS)")
+public class MesEsop extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STEP_SEQ")
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
+    private String groupName;
+
+    @Transient
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Transient
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Transient
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Transient
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -49,20 +49,18 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name = "SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "同步时间")
     private String syncTime;
 
-    @Column(name = "SYNC_PATTERN")//2.新增  1.修改
-    @ApiParam("同步方式")
+    @Column(name = "SYNC_PATTERN")
+    @ApiParam("同步方式 2.新增  1.修改")
     private Integer syncPattern;
 
-    @Column(name = "SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
-    @ApiParam("同步类型")
+    @Column(name = "SYNC_TYPE")
+    @ApiParam("同步类型 1.pcn获取mes数据   2.pcn推送数据至mes")
     private Integer syncType;
 
     @Column(name = "LAST_SYNC_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "上一同步时间")
     private String lastSyncTime;
 
@@ -74,6 +72,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "从数据库抽取的条件限制")
     private String extractCondition;
 
+    @Column(name = "IS_IGNORE_ORG")
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -30,41 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
-    @ApiParam("图片URL")
-    private String pictureUrl;
-
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
 
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
 
-    @Column(name = "SOP_NAME")
-    @ApiParam("SOP名称")
-    private String sopName;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
+    @ApiParam("图片URL")
+    private String pictureUrl;
 }

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

@@ -120,9 +120,9 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Transient
     @ApiParam("返回信息")
@@ -187,7 +187,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 ", operateType=" + operateType +
                 ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +

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

@@ -112,7 +112,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -203,6 +203,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("mes生产工单页面按钮控制")
     private MesButtonFlagModel mesButtonFlagModel;
 
+    @Transient
+    @ApiParam("批量打包开窗页面查询工单=1")
+    private String pageType;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 3:09 下午
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class EsopFileModel {
+
+    private MesEsop esop;
+
+    private MesFile file;
+
+}

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model;
 
 
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -67,9 +66,6 @@ public class ProdPackageModel {
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
-    @ApiParam("工单集合")
-    private List<MesWorkOrder> workOrderList;
-
     @ApiParam("打印状态文字")
     private String printStrStatus;
 

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionMethodRepository extends BaseRepository<MesActionMethod, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionRepository extends BaseRepository<MesAction, Long> {
+
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEventAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
+
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesFileRepository extends BaseRepository<MesFile, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
+
+}

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

@@ -76,7 +76,7 @@ public class MesHqlPack {
     public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
         return packBean;
     }
 
@@ -126,8 +126,13 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+        } else {
+            if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) {
+                DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(),
+                        MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean);
+            }
         }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ESOP")
+@Api("作业指导书信息表(ODS)")
+public class MesEsop extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STEP_SEQ")
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("组名")
+    private String groupName;
+
+    @Transient
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Transient
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Transient
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Transient
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+
+}

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,6 +28,9 @@ import javax.persistence.Table;
 @Table(name = "MES_PCN_SYNC_CFG")
 @Api("MES_PCN_同步配置")
 public class MesPcnSyncCfg extends BaseBean {
+
+    private static final long serialVersionUID = 7270930330576127126L;
+
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;
@@ -49,20 +52,18 @@ public class MesPcnSyncCfg extends BaseBean {
     private Integer syncFrequency;
 
     @Column(name = "SYNC_TIME")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "同步时间")
     private String syncTime;
 
-    @Column(name = "SYNC_PATTERN")//2、新增  1、修改
-    @ApiParam("同步方式")
+    @Column(name = "SYNC_PATTERN")
+    @ApiParam("同步方式 2、新增  1、修改")
     private Integer syncPattern;
 
-    @Column(name = "SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
-    @ApiParam("同步类型")
+    @Column(name = "SYNC_TYPE")
+    @ApiParam("同步类型 1.pcn获取mes数据   2.pcn推送数据至mes")
     private Integer syncType;
 
     @Column(name = "LAST_SYNC_TIME")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "上一同步时间")
     private String lastSyncTime;
 
@@ -74,6 +75,14 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "从数据库抽取的条件限制")
     private String extractCondition;
 
+    @Column(name = "IS_IGNORE_ORG")
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    public int getIsIgnoreOrgVal() {
+        return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
+    }
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
-    @ApiParam("图片URL")
-    private String pictureUrl;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
+    @Transient
+    @ApiParam("文件原名称")
+    private String fileOriginName;
 }

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

@@ -117,9 +117,9 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("条码类型")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
@@ -184,7 +184,7 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", operateType=" + operateType +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';

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

@@ -112,6 +112,14 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
+import cn.estsh.i3plus.pojo.mes.bean.MesFile;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/4 3:09 下午
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("FastDfs文件model")
+public class EsopFileModel {
+
+    private MesEsop esop;
+
+    private MesFile file;
+
+}

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

@@ -22,6 +22,9 @@ public class FastDfsDownloadModel {
     @ApiParam("部分相对路径")
     private String dirPath;
 
+    @ApiParam("fdfs文件路径")
+    private String fdfsPath;
+
     @ApiParam("文件名称")
     private String fileName;
 

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 16:44
+ * @Modify:
+ **/
+@Data
+public class ProduceCtgyPictureModel {
+
+    private Long id;
+    private String createUser;
+    private String createDatetime;
+    private String modifyUser;
+    private String modifyDatetime;
+    private String organizeCode;
+    private Integer isValid;
+    private Integer isDeleted;
+
+    @ApiParam("产品类型代码")
+    private String produceCtgyCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @ApiParam("文件原名称")
+    private String fileOriginName;
+    @ApiParam("文件URL")
+    private String fileUrl;
+    @ApiParam("组名")
+    private String groupName;
+
+    public ProduceCtgyPictureModel() {
+    }
+
+    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
+        this.id = id;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.produceCtgyCode = produceCtgyCode;
+        this.sideLocation = sideLocation;
+        this.fileId = fileId;
+        this.fileOriginName = fileOriginName;
+        this.fileUrl = fileUrl;
+        this.groupName = groupName;
+    }
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesFileRepository extends BaseRepository<MesFile, Long> {
+}

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import org.springframework.util.StringUtils;
 
@@ -416,14 +417,14 @@ public class MesHqlPack {
      * @param mesWcCheck
      * @return
      */
-    public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode);
+    public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode);
 //        DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
-        DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean);
+        DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean);
         return packBean;
     }
 
@@ -470,31 +471,22 @@ public class MesHqlPack {
     /**
      * MES 上传文件FastDfs封装
      *
-     * @param mesESOP
+     * @param esop
      * @return
      */
-    public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
+    public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
         DdlPackBean packBean = getAllBaseData(org);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
-        DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
-        DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
         return packBean;
     }
 
-    public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
-        if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
-        }
-
+    public static DdlPackBean getEsop(MesEsop esop, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode);
+        DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean);
         return packBean;
     }
 
@@ -1059,16 +1051,9 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
-        if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) {
-            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
-        }
-        if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) {
-            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
-        }
-        if (null != pcnSyncCfg.getSyncType()) {
-            DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
-        }
-
+        DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+        DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+        DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
         return packBean;
     }
 
@@ -1426,28 +1411,6 @@ public class MesHqlPack {
     }
 
     /**
-     * MES 产品类型图片查询条件封装
-     *
-     * @param mesProduceCtgyPicture
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
-        }
-        return packBean;
-    }
-
-
-    /**
      * 设备通知对象配置 查询条件封装
      *
      * @param mesEquNotifyObjectCfg
@@ -1875,14 +1838,20 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+//            DdlPreparedPack.timeBuilder(
+//                    mesProduceSn.getOutWorkCenterStartTime(),
+//                    mesProduceSn.getOutWorkCenterEndTime(),
+//                    "outWorkCenterTime", packBean, true);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSn.getCreateDateTimeStart(),
                 mesProduceSn.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getOutWorkCenterStartTime(),
-                mesProduceSn.getOutWorkCenterEndTime(),
-                "outWorkCenterTime", packBean, true);
         return packBean;
     }
 

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

@@ -65,6 +65,11 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "任务自动初始化", example = "0")
     private Integer autoInit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false)
+    @ApiParam(value = "是否连带提交创建状态移动单", example = "2")
+    private Integer isCommitRefMove;
+
     @Lob
     @Column(name = "POSITION")
     @ApiParam(value = "GOJS位置")

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

@@ -97,6 +97,14 @@ public class WmsBom extends BaseBean {
     @Transient
     public String routingCode;
 
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "线边库位代码")
+    private String locateNo;
+
+    @Column(name = "TERMINAL_NO")
+    @ApiParam(value = "工位代码")
+    private String terminalNo;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty.doubleValue();
     }

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 车辆信息
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CAR")
+@Api("车辆信息")
+public class WmsCar extends BaseBean {
+
+    @Column(name="CAR_NO")
+    @ApiParam(value ="车牌号")
+    private String carNo;
+
+    @Column(name="CAR_DESC")
+    @ApiParam(value ="车辆描述")
+    private String carDesc;
+
+    @Column(name="MAX_CAPACITY")
+    @ApiParam(value ="载重量(KG)")
+    private String maxCapacity;
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="默认驾驶员")
+    private String driverNo;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车主电话")
+    private String phone;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value ="所属供应商")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("司机名称")
+    private String driverNameRdd;
+
+    @Transient
+    @ApiParam(value = "供应商名称")
+    private String vendorNameRdd;
+}

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

@@ -34,15 +34,9 @@ public class WmsOperationBean<Obj> extends BaseBean {
     @ApiParam("任务单号")
     public String taskNo;
 
-    /**
-     * 触发源:
-     * 10=扫描枪,
-     * 20=提交按钮,
-     * 30=重置按钮,
-     * 40=查看明细,
-     * 50=明细(删除),
-     * 60=明细（清空）
-     */
+    @ApiParam("业务单号")
+    public String refSrc;
+
     @ApiParam("触发源")
     public int sourceOwner;
 

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

@@ -191,10 +191,22 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 
+    @Column(name = "CYCLE_RQUEST_PERIOD")
+    @ApiParam(value = "循环补货周期", example = "0")
+    private Integer cycleRquestPeriod = 0;
+
+    @Column(name = "CYCLE_RQUEST_QTY")
+    @ApiParam(value = "循环补货数量", example = "0")
+    private Double cycleRquestQty = 0d;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 
+    public int getCycleRquestPeriod(){
+        return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
+    }
+
     public WmsPart() {
     }
 
@@ -210,6 +222,10 @@ public class WmsPart extends BaseBean {
         return max == null? 0:max;
     }
 
+    public Double getCycleRquestQty() {
+        return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
+    }
+
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
         this.partNo = partNo;

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 班次表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT")
+@Api("班次信息")
+public class WmsShift extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592714L;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 班休表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT_REST")
+@Api("班休信息")
+public class WmsShiftRest extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592715L;
+
+    @Column(name="REST_NO")
+    @ApiParam("班休代码")
+    private String restNo;
+
+    @Column(name="REST_NAME")
+    @ApiParam("班休名称")
+    private String restName;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="START_REST_TIME")
+    @ApiParam("开始休息时间")
+    private String startRestTime;
+
+    @Column(name="END_REST_TIME")
+    @ApiParam("结束休息时间")
+    private String endRestTime;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+/**
+ * @Description : 工位表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-12-03 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TERMINAL")
+@Api("工位信息")
+public class WmsTerminal extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592713L;
+    @Column(name="TERMINAL_NO")
+    @ApiParam("工位代码")
+    private String terminalNo;
+
+    @Column(name="TERMINAL_NAME")
+    @ApiParam("工位名称")
+    private String terminalName;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+}

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 驾驶员信息
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TMS_DRIVER")
+@Api("驾驶员信息")
+public class WmsTmsDriver extends BaseBean {
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam(value ="驾驶员姓名")
+    private String driverName;
+
+    @Column(name="SEX")
+    @ApiParam(value ="驾驶员性别")
+    private Integer sex;
+
+    @Column(name="AGE")
+    @ApiParam(value ="驾驶员年龄")
+    private String age;
+
+    @Column(name="ID_NO")
+    @ApiParam(value ="驾驶员身份证号")
+    private String idNo;
+
+    @Column(name="ADRESS")
+    @ApiParam(value ="驾驶员籍贯")
+    private String adress;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车牌号")
+    private String phone;
+
+    @Column(name="LOGIN_NO")
+    @ApiParam(value =" 登录账号")
+    private String loginNo;
+}

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

@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 车辆信息
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TMS_SHIPPING_EXT")
+@Api("装车单信息")
+public class WmsTmsShippingExt extends BaseBean {
+
+    @Column(name="MOVE_NO")
+    @ApiParam(value ="移库单号")
+    private String moveNo;
+
+    @Column(name="DESTINATION")
+    @ApiParam(value ="到货地点")
+    private String destination;
+
+    @Column(name="REC_USER")
+    @ApiParam(value ="接收人")
+    private String recUser;
+
+    @Column(name="REC_PHONE")
+    @ApiParam(value ="接收人电话")
+    private String recPhone;
+
+    @Column(name="DOCK_NO")
+    @ApiParam(value ="道口")
+    private String dockNo;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value ="承运商编号")
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam(value ="承运商名称RDD")
+    private String vendorName;
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam(value ="驾驶员名称RDD")
+    private String driverName;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="驾驶员联系方式RDD")
+    private String phone;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value ="单据状态")
+    private String orderStatus;
+
+    @Column(name="CUST_NAME")
+    @ApiParam(value ="客户名称RDD")
+    private String custName;
+
+    @Column(name="CUST_NO")
+    @ApiParam(value ="客户编号RDD")
+    private String custNo;
+
+    @Column(name="CAR_NO")
+    @ApiParam(value ="车牌号RDD")
+    private String carNo;
+
+    @Column(name="DELIVERY_TIME")
+    @ApiParam(value ="计划发车时间")
+    private String deliveryTime;
+
+    @Column(name="ARRIVEL_TIME")
+    @ApiParam(value ="要求到货时间")
+    private String arrivelTime;
+
+    @Column(name="DEPART")
+    @ApiParam(value =" 申请部门")
+    private String depart;
+
+}

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

@@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "SRC_WHERE", length = 255)
     public String srcWhere;
+
+    /**
+     * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔
+     */
+    @Column(name = "SRC_GROUP_COLUMNS", length = 255)
+    public String srcGroupColumns;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
      * 例如：SYNFLG=Y,SYNDATE={#XX}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.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.WmsCar;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 车辆
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-04 15:29
+ * @Modify:
+ **/
+@Repository
+public interface WmsCarRepository extends BaseRepository<WmsCar, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班次信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班休信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工位信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsTerminalRepository extends BaseRepository<WmsTerminal, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCar;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 驾驶员
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-12-04 15:29
+ * @Modify:
+ **/
+@Repository
+public interface WmsTmsDriverRepository extends BaseRepository<WmsTmsDriver, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :装车单
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsTmsShippingExtRepository extends BaseRepository<WmsTmsShippingExt,Long> {
+
+}

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

@@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -2517,4 +2521,57 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 工位信息分页查询条件
+     *
+     * @param wmsTerminal
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result);
+
+        getStringBuilderPack(wmsTerminal, result);
+
+        return result;
+    }
+
+    /**
+     * 班次信息分页查询条件
+     *
+     * @param wmsShift
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
+
+        getStringBuilderPack(wmsShift, result);
+
+        return result;
+    }
+
+    /**
+     * 班休信息分页查询条件
+     *
+     * @param wmsShiftRest
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestNo(), "restNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestName(), "restName", result);
+
+        getStringBuilderPack(wmsShiftRest, result);
+
+        return result;
+    }
+
 }