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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -325,6 +325,18 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "安灯状态集合")
     private List<String> statusCodeList;
 
+    @Transient
+    @ApiParam(value = "日发生次数")
+    private int dayTime;
+
+    @Transient
+    @ApiParam(value = "周发生次数")
+    private int weekendsTime;
+
+    @Transient
+    @ApiParam(value = "事件统计报表该事件描述的总次数")
+    private int acCodeTime;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
@@ -372,7 +384,9 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+    public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+        this.acCode = acCode;
+        this.acNameRdd = acNameRdd;
         this.workCenterCode = workCenterCode;
         this.workCenterNameRdd = workCenterNameRdd;
         this.workCellCode = workCellCode;

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

@@ -106,6 +106,52 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 统计方式
+     * 10-是，20-否
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COUNT_TYPE {
+        DAY("10","按照天统计"),
+        WEEKEND("20","按照周统计");
+
+        private String value;
+        private String description;
+
+        COUNT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 按灯状态
      * 10-是，20-否
      */
@@ -317,8 +363,6 @@ public class AndonEnumUtil {
     }
 
 
-
-
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      */

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

@@ -46,11 +46,20 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_PCN_TASK_STATUS {
@@ -115,7 +124,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -394,9 +403,9 @@ public class MesEnumUtil {
 
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        OPEN(30, "开启"),
+        OPEN(30, "启动"),
         PAUSE(40, "暂停"),
-        CANCEL(50, "撤销"),
+        CANCEL(50, "取消"),
         CLOSE(60, "关闭");
 
         private int value;
@@ -552,7 +561,9 @@ public class MesEnumUtil {
 
         MES("MES", "来源于MES"),
         AMES("AMES", "来源于AMES"),
-        SAP("SAP", "来源于SAP");
+        SAP("SAP", "来源于SAP"),
+        CREATE("CREATE", "手工新增"),
+        RESOLVE("RESOLVE", "计划分解");
 
         private String value;
         private String description;
@@ -930,15 +941,15 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STEP_PARAM_TYPE {
 
-        QUALIFIED(10,"number", "数字"),
+        QUALIFIED(10, "number", "数字"),
-        DEFECTED(20, "text","字符串"),
+        DEFECTED(20, "text", "字符串"),
-        SCRAPED(30,"select", "可选值");
+        SCRAPED(30, "select", "可选值");
 
         private int value;
         private String code;
         private String description;
 
-        STEP_PARAM_TYPE(int value,String code, String description) {
+        STEP_PARAM_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -948,7 +959,9 @@ public class MesEnumUtil {
             return value;
         }
 
-        public String getCode(){return code;}
+        public String getCode() {
+            return code;
+        }
 
         public String getDescription() {
             return description;
@@ -1037,8 +1050,14 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath"),
+        FASTDFS_SAVE_PATH(10, "SAVE_PATH"),
-        NGINX_IP(20, "nginxIp");
+        NGINX_IP(20, "NGINX_HOST"),
+        MES_STATION_SOCKET(30, "mes_station_socket"),
+        GATEWAY_IP(40, "GATEWAY_HOST"),
+        UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
+        PCN_PULL(60, "PCN_PULL"),
+        PCN_PUSH(70, "PCN_PUSH"),
+        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD");
 
         private int value;
         private String description;
@@ -1110,7 +1129,7 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPANY_TYPE {
-        RULECODE("ruleCode","规则编码"),
+        RULECODE("ruleCode", "规则编码"),
         PREFIX("prefix", "前缀"),
         PART_NO("partNo", "物料号"),
         CUST_PART_NO("custPartNo", "客户物料号"),

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

@@ -13,13 +13,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_STATUS{
+    public enum MES_PCN_TASK_STATUS {
 
-        OPEN(1,"OPEN"),
+        OPEN(1, "OPEN"),
-        CLOSE(2,"CLOSE");
+        CLOSE(2, "CLOSE");
 
         private int value;
         private String description;
@@ -50,13 +49,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务同步结果状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_SYNC_STATUS{
+    public enum MES_PCN_TASK_SYNC_STATUS {
 
-        SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
+        SUCCESS(1, "mes主服务定时任务工作清单同步成功"),
-        ERROR(2,"mes主服务定时任务工作清单同步失败");
+        ERROR(2, "mes主服务定时任务工作清单同步失败");
 
         private int value;
         private String description;
@@ -90,10 +88,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_PATTERN{
+    public enum SYNC_PATTERN {
 
-        UPDATE(1,"修改或新增"),
+        UPDATE(1, "修改或新增"),
-        INSERT(2,"新增");
+        INSERT(2, "新增");
 
         private int value;
         private String description;
@@ -127,10 +125,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_TYPE{
+    public enum SYNC_TYPE {
 
-        GET_MES_DATA(1,"pcn获取mes数据"),
+        GET_MES_DATA(1, "pcn获取mes数据"),
-        DATA_TO_MES(2,"pcn推送数据至mes");
+        DATA_TO_MES(2, "pcn推送数据至mes");
 
         private int value;
         private String description;
@@ -232,4 +230,119 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * RAW_PART_TYPE 原材料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_TYPE {
+
+        RAW(10, "lotNo", "原材料"),
+        SEMIFINISHED(20, "fixLotNo", "半成品");
+
+        private int value;
+        private String code;
+        private String description;
+
+        RAW_PART_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 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;
+        }
+    }
+
+    /**
+     * RAW_PART_STATUS 原材料状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_STATUS {
+
+        READY(10, "待投料"),
+        ALREADY(20, "已投料");
+
+        private int value;
+        private String description;
+
+        RAW_PART_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PROCESS_BOM_ISFEED 是否投料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_BOM_ISFEED {
+
+        FEED(1, "投料"),
+        NOT_FEED(2, "不投料");
+
+        private int value;
+        private String description;
+
+        PROCESS_BOM_ISFEED(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;
+        }
+    }
+
+
 }

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

@@ -830,6 +830,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -395,6 +395,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成小于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成大于语句
      *
      * @param columnName 列名
@@ -405,6 +417,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装double对象成小于语句
@@ -417,6 +440,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装long或者int的整数对象成equal语句(不等于)

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

@@ -70,6 +70,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     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/MesWorkOrder.java

@@ -119,6 +119,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("审批状态")
     private Integer approvalStatus;
 
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     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/repository/MesCellFeedRepository.java

@@ -0,0 +1,14 @@
+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.MesCellFeed;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesCellFeedRepository extends BaseRepository<MesCellFeed, Long> {
+}

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

@@ -0,0 +1,15 @@
+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.MesCellFeed;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesRawPartSnRepository extends BaseRepository<MesRawPartSn, Long> {
+}

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

@@ -1,10 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class MesHqlPack {
 
+
     /**
      * 通用查询条件
      *
@@ -52,6 +54,7 @@ public class MesHqlPack {
 
     /**
      * 根据打印模板的模板代码查询模板信息
+     *
      * @param organizeCode
      * @param mesLabelTemplate
      * @return
@@ -63,4 +66,35 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 获取工作中心下所有的投料数据
+     * @param mesCellFeed
+     * @param org
+     * @return
+     */
+    public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        return packBean;
+    }
+
+
+    /**
+     * 获取原材料扫描信息的对应工序BOM
+     * @param mesProcessBom
+     * @param mesRawPartSn
+     * @return
+     */
+    public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) {
+        DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean);
+        DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
+        return packBean;
+    }
+
+
 }

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

@@ -57,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,11 +66,14 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
-
     @Column(name="EXTRACT_GAP")
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -0,0 +1,50 @@
+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;
+
+/**
+ * @Description :mes状态配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_STATUS")
+@Api("系统业务动作")
+public class MesStatus extends BaseBean {
+    @Column(name="STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name="STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private Integer statusValue;
+
+    @Column(name="STATUS_FIELD")
+    @ApiParam("状态字段")
+    private String statusField;
+
+    public int getStatusValueVal() {
+        return this.statusValue == null ? 0 : this.statusValue;
+    }
+}

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:
@@ -132,6 +129,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("审批状态")
     private Integer approvalStatus;
 
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
@@ -150,6 +155,10 @@ public class MesWorkOrder extends BaseBean {
     public String shiftName;
 
     @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
     @ApiParam(value="产品配置名称")
     public String prodCfgName;
 

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

@@ -0,0 +1,222 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
+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: wangjie
+ * @CreateDate:2019-09-19-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_WORK_ORDER_LOG")
+@Api("生产工单日志")
+public class MesWorkOrderLog extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="COMPLETE_QTY")
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @Column(name="REPAIR_QTY")
+    @ApiParam("返修数量")
+    private Double repairQty;
+
+    @Column(name="SCRAP_QTY")
+    @ApiParam("报废数量")
+    private Double scrapQty;
+
+    @Column(name="SEQ")
+    @ApiParam("工单序号")
+    private Double seq;
+
+    @Column(name="WO_STATUS")
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @Column(name="WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name="NEXT_ORDER")
+    @ApiParam("下一工单")
+    private String nextOrder;
+
+    @Column(name="PLAN_ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String planOrderNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="SCHEDULE_DATE")
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Column(name="WO_SOURCE")
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    /**********************  冗余字段 *********************************/
+    @Transient
+    @ApiParam(value="工作中心名称")
+    public String workCenterName;
+
+    @Transient
+    @ApiParam(value="工作单元名称")
+    public String workCellName;
+
+    @Transient
+    @ApiParam(value="客户产线名称")
+    public String custProdLineName;
+
+    @Transient
+    @ApiParam(value="班次名称")
+    public String shiftName;
+
+    @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
+    @ApiParam(value="产品配置名称")
+    public String prodCfgName;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
+    public String startTimeStart;
+
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
+    public String startTimeEnd;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
+    public String endTimeStart;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
+    public String endTimeEnd;
+
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getCompleteQtyVal() {
+        return this.completeQty == null ? 0.0d : this.completeQty;
+    }
+
+    public double getRepairQtyVal() {
+        return this.repairQty == null ? 0.0d : this.repairQty;
+    }
+
+    public double getScrapQtyVal() {
+        return this.scrapQty == null ? 0.0d : this.scrapQty;
+    }
+
+    public double getSeqVal() {
+        return this.seq == null ? 0.0d : this.seq;
+    }
+
+    public int getWorkOrderStatusVal() {
+        return this.workOrderStatus == null ? 0 : this.workOrderStatus;
+    }
+
+    public int getWorkOrderTypeVal() {
+        return this.workOrderType == null ? 0 : this.workOrderType;
+    }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
+}

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

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/20 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单审批页面数据明细封装model")
+public class MesWorkOrderApprovalDetailModel implements Serializable {
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("封装的数据值")
+    private String name;
+
+}

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/20 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产工单审批页面数据封装model")
+public class MesWorkOrderApprovalModel implements Serializable {
+
+    @ApiParam("表头列名集合")
+    List<String> tableNames;
+
+    @ApiParam("所有行数据集合：多行数据是集合，每一个所有单元格是一个集合，一个单元格含有多条数据是一个集合")
+    List<List<List<MesWorkOrderApprovalDetailModel>>> detailModelsList;
+
+
+}

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

@@ -23,14 +23,14 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("修改按钮")
     private boolean updateButton;
 
-    @ApiParam("按配置修改按钮")
+//    @ApiParam("按配置修改按钮")
-    private boolean updateButton4Config;
+//    private boolean updateButton4Config;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;
 
-    @ApiParam("测试动态下达按钮")
+//    @ApiParam("测试动态下达按钮")
-    private boolean dynamicTransmitButton4Test;
+//    private boolean dynamicTransmitButton4Test;
 
     @ApiParam("启动按钮")
     private boolean startUpButton;
@@ -38,7 +38,7 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("暂停按钮")
     private boolean suspendButton;
 
-    @ApiParam("撤销按钮")
+    @ApiParam("取消按钮")
     private boolean revokeButton;
 
     @ApiParam("关闭按钮")

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-19-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkOrderLogRepository extends BaseRepository<MesWorkOrderLog, Long> {
+}

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

@@ -154,31 +154,38 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
+        if (mesWorkOrder.getApprovalStatus() != null) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
+        }
         if (mesWorkOrder.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
         // 时间段查询
-//        DdlPreparedPack.timeBuilder(
+        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getStartTimeStart(),
+                mesWorkOrder.getStartTimeStart(),
-//                mesWorkOrder.getStartTimeEnd(),
+                mesWorkOrder.getStartTimeEnd(),
-//                "startTime", packBean, true);
+                "startTime", packBean, true);
-//        DdlPreparedPack.timeBuilder(
+        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getEndTimeStart(),
+                mesWorkOrder.getEndTimeStart(),
-//                mesWorkOrder.getEndTimeEnd(),
+                mesWorkOrder.getEndTimeEnd(),
-//                "endTime", packBean, true);
+                "endTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getCreateDateTimeStart(),
+                mesWorkOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
@@ -356,6 +363,24 @@ public class MesHqlPack {
     }
 
     /**
+     * MES班组信息查询条件封装
+     * @param shiftGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
+
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES班次休息信息查询条件封装
      *
      * @param shiftRest
@@ -733,6 +758,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean);
         DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
         return packBean;
     }
@@ -802,13 +828,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
-        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
+        DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
-            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+        DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
-        }
-        if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
-            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
-        }
-
         return packBean;
     }
 

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

@@ -93,4 +93,16 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "散件移库输入移库数量")
     @Transient
     public Double inputMoveQty;
+
+    @Transient
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam("ERP库存地")
+    private String erpWhNo;
 }

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

@@ -177,6 +177,19 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
+
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
+
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;

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

@@ -148,11 +148,22 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("获取数量大于0")
     private Integer qtyIdentity;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public  Integer lockVersion;
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,

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

@@ -188,6 +188,17 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveSn() {
     }
 

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

@@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean {
 
     @Column(name = "ROUTING_CODE")
     @ApiParam(value = "线路编号")
-    private String areaNo;
+    private String routingCode;
  
 
     public WmsPartRouting(){}

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

@@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
     private Integer ruleType;
 
-    @Column(name = "ZONE_NO_SRC")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam(value = "源存储区")
-    private String zoneNoSrc;
+    private String srcZoneNo;
 
-    @Column(name = "ZONE_NO_TARGET")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam(value = "目标存储区" , example = "2")
-    private String zoneNoTarget;
+    private String destZoneNo;
 
     @Column(name = "OP_TYPE_CODE")
     @ApiParam(value = "作业类型" , example = "2")
@@ -79,6 +79,9 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
     private String delayUnit;
 
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
     
     public WmsRoutingRule(){}
 

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

@@ -152,6 +152,16 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "移动单条码集合")
     private List<WmsMoveSn> wmsMoveSnList;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return this.isSnapshot == null ? 0 : this.isSnapshot;
+    }
 
     public String getAreaNo() {
         return areaNo;

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

@@ -239,12 +239,23 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "目标数量")
     public Double destQty;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
 
     public Double getQty() {

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

@@ -218,7 +218,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
 
     public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName,
                                 Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty,String snapshotTime) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -235,6 +235,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
+        this.snapshotTime =snapshotTime;
     }
 
     public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java

@@ -23,6 +23,8 @@ public class WmsSNNextStatusRule {
     private int srcSNStatusCode;
     // 目的条码状态
     private int destSNStatusCode;
+    // 目的条码的质量状态
+    private int destQCStatusCode;
 
     public int getTransTypeCode() {
         return transTypeCode;
@@ -79,4 +81,12 @@ public class WmsSNNextStatusRule {
     public void setDefaultInStock(boolean defaultInStock) {
         this.defaultInStock = defaultInStock;
     }
+
+    public int getDestQCStatusCode() {
+        return destQCStatusCode;
+    }
+
+    public void setDestQCStatusCode(int destQCStatusCode) {
+        this.destQCStatusCode = destQCStatusCode;
+    }
 }

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsCheckPointRepository extends BaseRepository<WmsCheckPoint,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveDetailsSnapshotRepository extends BaseRepository<WmsMoveDetailsSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveMasterSnapshotRepository extends BaseRepository<WmsMoveMasterSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveSnSnapshotRepository extends BaseRepository<WmsMoveSnSnapshot,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.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.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 库存信息快照
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockQuanSnapshotRepository extends BaseRepository<WmsStockQuanSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockSnSnapshotRepository extends BaseRepository<WmsStockSnSnapshot,Long> {
+}

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

@@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+public interface WmsRoutingRuleRepository extends BaseRepository<WmsRoutingRule ,Long> {
 
 }

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

@@ -2359,4 +2359,36 @@ public class WmsHqlPack {
 
         return result;
     }
+    
+    
+    
+    /**
+     * 业务：库存查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRouting, result);
+
+        return result;
+    }
+    
+    public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
+//        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRoutingRule, result);
+
+        return result;
+    }
 }