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

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

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

@@ -2436,7 +2436,8 @@ public class MesEnumUtil {
 
         NORMAL(10, "正常"),
         REWORK(20, "返修"),
-        ON_LINE(30, "上线工位");
+        ON_LINE(30, "上线工位"),
+        QUALITY_CHECK(40, "质检工位");
 
         private int value;
         private String description;
@@ -3416,7 +3417,8 @@ public class MesEnumUtil {
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
         SPARE_RETURN_REPAIR(140, "客退备件返修"),
-        SEIZE_SEAT_ORDER(150, "占位工单");
+        SEIZE_SEAT_ORDER(150, "占位工单"),
+        SAMPLE_ORDER(160, "样件工单");
 
         private int value;
         private String description;
@@ -3581,11 +3583,11 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_STATUS {
 
+        WAIT_LANDED(5, "待下达"),
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -5309,7 +5311,8 @@ public class MesEnumUtil {
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
         BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
-        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板");
+        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"),
+        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板");
 
         private String code;
         private String description;
@@ -7774,4 +7777,86 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 功能模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_MENU_CODE {
+
+        STATION_MONITOR("STATION_MONITOR", "工位监控");
+
+        private String value;
+        private String description;
+
+        SRC_MENU_CODE(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 (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 缺陷类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DEFECT_TYPE_CODE {
+        SCRAPPED("SCRAPPED", "报废"),
+        BACK_SPRAY("BACK_SPRAY", "返喷"),
+        POLISHING("POLISHING", " 抛光"),
+        DETERMIND("DETERMIND", " 待定");
+
+        private String value;
+        private String description;
+
+        DEFECT_TYPE_CODE(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 value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil {
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -5705,6 +5704,86 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 功能模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_MENU_CODE {
+
+        STATION_MONITOR("STATION_MONITOR", "工位监控");
+
+        private String value;
+        private String description;
+
+        SRC_MENU_CODE(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 (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 弹窗异常提醒记录 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXCEPTION_WINDOW_RECORD_STATUS {
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private Integer value;
+        private String description;
+
+        EXCEPTION_WINDOW_RECORD_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 设备故障等级
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5757,6 +5836,4 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
-
-
 }

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

@@ -496,6 +496,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于语句
      *
      * @param columnName 列名
@@ -508,6 +520,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于等于语句
      *
      * @param columnName 列名
@@ -520,6 +544,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装long或者int的整数对象成equal语句(不等于)
      *
      * @param columnName 列名

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

@@ -88,7 +88,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         return packBean;
     }
 

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

@@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
 }

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

@@ -0,0 +1,48 @@
+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 java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG")
+@Api("MES_看板自定义参数配置")
+public class MesBoardCustomParamCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883827194753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+}

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

@@ -101,6 +101,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("质量状态")
     private Integer qcStatus;
 
+    @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectActionTypeName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -43,6 +43,10 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
     @ApiParam("作业类型")
     private Integer taskType;
 
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
+
     @Column(name = "TASK_CYCLE")
     @ApiParam("周期(天)")
     private Integer taskCycle;

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

@@ -0,0 +1,55 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :设备计划配置
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2020-10-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_PLAN_CFG")
+@Api("设备周期作业计划配置")
+public class MesEquTaskPlanCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7734079474434307857L;
+
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
+
+    @Column(name = "BACKGROUND_COLOR")
+    @ApiParam("显示背景色")
+    private String backgroundColor;
+
+    @Column(name = "COLOR")
+    @ApiParam("字体颜色")
+    private String color;
+
+    @Column(name = "CYCLE")
+    @ApiParam("周期(天)")
+    private Integer taskCycle;
+
+    @Column(name = "DISPLAY_TEXT")
+    @ApiParam("显示文字")
+    private String displayText;
+
+}

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

@@ -0,0 +1,49 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_ALERT_CFG")
+@Api("MES_异常提醒配置")
+public class MesExceptionAlertCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895221L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "SRC_MENU_NAME")
+    @ApiParam("来源模块名称")
+    private String srcMenuName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "USER_CODE_GROUP")
+    @ApiParam("提醒人员集合")
+    private String userCodeGroup;
+}

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

@@ -0,0 +1,55 @@
+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 java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_WINDOW_RECORD")
+@Api("MES_弹窗异常提醒记录")
+public class MesExceptionWindowRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895345L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "USER_CODE")
+    @ApiParam("提醒人员")
+    private String userCode;
+
+    @Column(name = "MESSAGE_TYPE")
+    @ApiParam("消息类型")
+    private Integer messageType;
+
+    @Column(name = "MESSAGE_HEAD")
+    @ApiParam("提示表头")
+    private String messageHead;
+
+    @Column(name = "MESSAGE_CONTENT")
+    @ApiParam("提示内容")
+    private String messageContent;
+
+    @Column(name = "STATUS")
+    @ApiParam("处理状态")
+    private Integer status;
+}

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

@@ -79,10 +79,22 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
     @Column(name = "STOCK_QTY")
     @ApiParam("排程实时库存")
     private Integer stockQty;
 
+    @Column(name = "MIN_GEN_LOT")
+    @ApiParam("最小下达批次")
+    private Integer minGenLot;
+
+    @Transient
+    @ApiParam("已下达箱数")
+    private Integer alreadyLandedNum;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;

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

@@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         return this.qty == null ? 0.0d : this.qty;
     }
 
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -85,6 +85,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
+    @Lob
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable {
     @ApiParam("工序代码名称")
     private String processCodeName;
 
+    @Transient
+    @ApiParam("正在生产队列数量")
+    private Integer genningNum;
+
 }

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

@@ -61,6 +61,10 @@ public class MesShift extends BaseBean implements Serializable {
     @ApiParam("班次顺序")
     private Integer shiftSeq;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     public int getShiftSeqVal() {
         return this.shiftSeq == null ? 0 : this.shiftSeq;
     }

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

@@ -48,4 +48,12 @@ public class MesShiftRest extends BaseBean implements Serializable {
     @ColumnDefault("0")
     @ApiParam("休息时长")
     private Double restTimes;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="REST_DESC")
+    @ApiParam("班休描述")
+    private String restDesc;
 }

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

@@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Integer length;
 
     @Transient
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Transient
     @ApiParam("校验内容")
     private String checkContent;
 

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

@@ -77,4 +77,7 @@ public class BoardModel {
 
     @ApiParam("工位状态监控明细")
     private List<MesBoardWorkCell> boardWorkCellList;
+
+    @ApiParam("天津麦格纳看板")
+    private MgnBoardAreaYieldModel mgnBoardAreaYieldModel;
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -19,12 +20,15 @@ public class FutrueTaskModel<T> {
     @ApiParam("实现类")
     private Object futrueTaskService;
 
-    @ApiParam("包装条码")
+    @ApiParam("工位请求bean")
     private StationRequestBean stationRequestBean;
 
-    @ApiParam("过程条码")
+    @ApiParam("产品条码表")
     private MesProduceSn produceSn;
 
+    @ApiParam("产品绑定记录表")
+    private MesProdBindRecord prodBindRecord;
+
     @ApiParam("组织代码")
     private String organizeCode;
 

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAreaYieldModel {
+
+    @ApiParam("组装")
+    private MgnBoardListModel assembleBoardListModel;
+
+    @ApiParam("涂装")
+    private MgnBoardListModel paintBoardListModel;
+
+    @ApiParam("注塑")
+    private MgnBoardListModel injectMoldBoardListModel;
+
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAssembleCompRateModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("合格率目标值")
+    private String qualifiedRateTargetValue;
+
+    @ApiParam("完成率")
+    private String planCompleteRate;
+
+    @ApiParam("合格率偏差值")
+    private String fpyDeviationValue;
+
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MgnBoardListModel {
+
+    @ApiParam("产线产量汇总")
+    private List<MgnBoardYieldModel> centerYieldList;
+
+    @ApiParam("月度产量汇总")
+    private List<MgnBoardYieldModel> monthlyYieldList;
+
+    @ApiParam("当班计划产量")
+    private Double shiftPlanYield;
+
+    @ApiParam("当班实际产量")
+    private Double shiftActualYield;
+
+    @ApiParam("计划完成率")
+    private String planCompleteRate;
+
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardYieldModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("计划产量")
+    private Double planYield;
+
+    @ApiParam("实际产量")
+    private Double actualYield;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPaintPolishingReportModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料描述")
+    private String partDesc;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("日期")
+    private String modifyDate;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("抛光数量")
+    private Double polishingQty;
+
+    @ApiParam("返喷标识")
+    private String reverseSprayMark;
+
+    @ApiParam("打磨件物料号")
+    private String polishPartNo;
+
+    @ApiParam("打磨件物料描述")
+    private String polishPartDesc;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

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

@@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable {
     public QueueOrderModel() {
     }
 
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
+
     public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
         this.queueSeq = queueSeq;

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

@@ -196,6 +196,22 @@ public class StationRequestBean implements Serializable {
     @ApiParam("密码")
     private String password;
 
+    public StationRequestBean() {
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.userInfo = userInfo;
+    }
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.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.MesBoardCustomParamCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardCustomParamCfgRepository extends BaseRepository<MesBoardCustomParamCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.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.MesEquTaskPlanCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskPlanCfgRepository extends BaseRepository<MesEquTaskPlanCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.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.MesExceptionAlertCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_异常提醒配置
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionAlertCfgRepository extends BaseRepository<MesExceptionAlertCfg, Long> {
+    
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.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.MesExceptionWindowRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_弹窗异常提醒记录
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionWindowRecordRepository extends BaseRepository<MesExceptionWindowRecord, Long> {
+    
+}

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

@@ -9,8 +9,8 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -870,7 +870,7 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
         if (!StringUtils.isEmpty(keyData.getObjectCode())) {
             DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean);
@@ -898,6 +898,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * MES 物料关键数据关系信息查询条件封装
      *
@@ -1660,6 +1661,24 @@ public class MesHqlPack {
     }
 
     /**
+     * 设备任务配置  查询条件封装
+     *
+     * @param equTaskPlanCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode);
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean);
+        }
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES 类型信息查询条件封装
      *
      * @param mesTypeCfg
@@ -2349,6 +2368,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * 监听任务查询条件封装
      *
@@ -2410,7 +2430,7 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List<String> orderList, String organizeCode) {
+    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, List<String> orderList, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean);
@@ -2442,7 +2462,7 @@ public class MesHqlPack {
                     queueJitActual.getCustPointEndDate(),
                     "createDatetime", packBean, true);
         }
-        if(!CollectionUtils.isEmpty(orderList)){
+        if (!CollectionUtils.isEmpty(orderList)) {
             DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean);
         }
         DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean);
@@ -3310,6 +3330,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT队列下达配置
+     *
      * @param jitIssueCfg
      * @param organizeCode
      * @return
@@ -3336,6 +3357,7 @@ public class MesHqlPack {
 
     /**
      * 条码照片关系
+     *
      * @param snPhotoRelation
      * @param organizeCode
      * @return
@@ -3415,4 +3437,42 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode());
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
+            DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
+                    "modifyDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) {
+        DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }

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

@@ -106,7 +106,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;
@@ -122,7 +122,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable {
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
     private Integer minuteDiff;//处理周期(分钟)
-    private String whereHql;//业务查询条件HQL
+    private List<String> fixPartList;//需要特殊处理的零件号集合
+    private String fixPartAndWhere; // 特殊零件号需要加的过滤条件
+    private Integer pageSize;//数据条数
+    private Integer isCheckSn;//是否检查条码存在
+    private Integer erpSyncFlag;//查询SHIPPING表的条件
+
 
     public int getMinuteDiffVal() {
         return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java

@@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable {
     private static final long serialVersionUID = -6968143574442339454L;
     private WmsMoveDetails details;
     private List<WmsMoveSn> moveSnList;
+
+    public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
+        this.details = details;
+        this.moveSnList = moveSnList;
+    }
+
+    public WmsMoveDetailsModel() {
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java

@@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable {
     private static final long serialVersionUID = -5490167040159056107L;
     private WmsMoveMaster moveMaster;
     private List<WmsMoveDetailsModel> moveDetails;
+
+    public WmsMoveMasterModel(WmsMoveMaster moveMaster, List<WmsMoveDetailsModel> moveDetails) {
+        this.moveMaster = moveMaster;
+        this.moveDetails = moveDetails;
+    }
+
+    public WmsMoveMasterModel() {
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -1,8 +1,11 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,4 +45,14 @@ public class WmsStockFifoModel {
 
     @ApiParam("同批次")
     private boolean fifoSameBatch;
+
+    @ApiParam("FIFO查询获取方式")
+    private Integer fifoSnByLood;
+
+    @ApiParam("物料条码信息")
+    Map<String, List<WmsStockSn>> snMap = new HashMap<>();
+
+    @ApiParam("所有推荐条码信息")
+    List<WmsStockSn> wmsStockSnAllList = new ArrayList<>();
+
 }

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

@@ -1232,4 +1232,23 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
+
+    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
+
+        DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
+
+        DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
@@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
+    public String getProcessStateTxt() {
+        return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
+                BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
+    }
+
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")
     private String processTime;

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

@@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
+    @Column(name = "REF_ITEM")
+    @ApiParam("关联行号")
+    public Integer refItem;
+
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")

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

@@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 库存移动单主表信息
@@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("总行数")
     private Long itemQty;
 
+    @Transient
+    @ApiParam("存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam("仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam("状态集合")
+    private List<Integer> orderStatusList;
+
+    @Transient
+    @ApiParam("交易类型集合")
+    private List<String> transTypeCodeList;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean {
         this.totalBoxes = totalBoxes.intValue();
         this.qty = qty;
     }
+
+    public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
+                              Double rcQty, Integer itemStatus) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.rcQty = rcQty;
+        this.itemStatus = itemStatus;
+    }
 }

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

@@ -221,6 +221,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;
 
+    @Column(name = "STD_CHECK_TIME")
+    @ApiParam(value = "标准质检时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer stdCheckTime;
+
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.persistence.Version;
 import java.util.List;
 
 /**
@@ -119,6 +120,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量")
     private Double scrapQty;
 
+    @Version
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
+    @ApiParam(value = "乐观锁", defaultValue = "0")
+    public Integer lockVersion;
+
     @Transient
     @ApiParam(value = "总数量")
     private Double totalQty;
@@ -220,6 +226,12 @@ public class WmsStockQuan extends BaseBean {
         return this.boxQty == null ? 0 : this.boxQty;
     }
 
+
+    public Integer getLockVersion() {
+        return this.lockVersion == null ? 0 : this.lockVersion;
+    }
+
+
     public WmsStockQuan() {
     }
 

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

@@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seqNo;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;

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

@@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "交易处理组件名称")
     private String tmName;
 
+    @Column(name = "DIRECT")
+    @ApiParam(value = "交易的方向：IN,OUT,MOVE")
+    private String direct;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;

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

@@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
      * @return 配置信息
      */
     WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
+
+    /**
+     * 按照配置代码查询配置信息
+     * @param configCode 配置代码
+     * @return 配置信息
+     */
+    WmsConfig getFirstByConfigCode(String configCode);
 }