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

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable {
     @ApiParam("安灯类型名称")
     private String alarmName;
 
+    @Column(name = "CODE")
+    @ApiParam("菜单编号")
+    private String code;
+
+    @Column(name = "COLOR")
+    @ApiParam("BI颜色")
+    private String color;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("安灯类型代码")
+    private String value;
+
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String description;
+
 }

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

@@ -10,10 +10,7 @@ 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 javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable {
     @Column(name = "MEMO")
     @ApiParam(value = "备注")
     private String memo;
+
+    @Lob
+    @Column(name = "MESSAGE")
+    @ApiParam(value = "广播内容")
+    private String message;
 }

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

@@ -96,4 +96,16 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     @ApiParam("触发类型默认不需要外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @Transient
+    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+    @Transient
+    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    private boolean execNextModuleFlag = true;
+
+    @Transient
+    @ApiParam("默认异常未处理")
+    private boolean doErrorFlag = false;
+
 }

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

@@ -9,10 +9,7 @@ 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 javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -64,4 +61,13 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     @ApiParam(value = "安灯来源类型")
     private String sourceType;
 
+    @Column(name = "CACHE_FLAG")
+    @ApiParam(value = "缓存标识")
+    private Integer cacheFlag;
+
+    @Lob
+    @Column(name = "CONTENT")
+    @ApiParam(value = "内容")
+    private String content;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java

@@ -31,6 +31,6 @@ public class AndonActionModuleGroupModel implements Serializable {
     @ApiParam("流程组件参数集合")
     private List<AndonRouteModuleParam> routeModuleParamList;
 
-    @ApiParam("区域流程组件参数集合")
+    @ApiParam("安灯流程组件参数集合")
     private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -42,7 +42,4 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("触发事件")
     private String triggerEvent;
 
-    @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent")
-    private String nextTriggerEvent;
-
 }

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

@@ -1175,7 +1175,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

@@ -6035,4 +6035,116 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -2552,7 +2552,10 @@ public class MesPcnEnumUtil {
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
         CUSTOM("custom", "定制页面"),
-        FORM("form", "文本按钮");
+        CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
+        FORM("form", "文本按钮"),
+        SPEC_TEXT("spec_text", "工步弹框文本"),
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
 
         private String value;
         private String description;
@@ -3789,6 +3792,220 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 界面类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WINDOW_TYPE {
+        BUTTON_CFG(10, "按钮组件"),
+        BOARD_BASE_WINDOW(20, "看板基础页面"),
+        STEP_WINDOW(30, "工步界面");
+
+        private int value;
+        private String description;
+
+        WINDOW_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 
     /**
      * 生产异常操作记录

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

@@ -0,0 +1,63 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_HISTORY")
+@Api("MES_盲检记录")
+public class MesBlindHistory extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601499L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "BLIND_OBJECT")
+    @ApiParam("盲检对象")
+    private String blindObject;
+
+    @Column(name = "BLIND_ITEM")
+    @ApiParam("盲检问题")
+    private String blindItem;
+
+    @Column(name = "SYSTEM_ANSWER")
+    @ApiParam("系统答案")
+    private String systemAnswer;
+
+    @Column(name = "CHOOSED_ANSWER")
+    @ApiParam("选中答案")
+    private String choosedAnswer;
+
+    @Column(name = "CHECKED")
+    @ApiParam("是否一致")
+    private Integer checked;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -0,0 +1,65 @@
+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:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_RULE")
+@Api("MES_盲检规则")
+public class MesBlindRule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601498L;
+
+    @Column(name = "RULE_ID")
+    @ApiParam("匹配规则ID")
+    private String ruleId;
+
+    @Column(name = "CAR_TYPE")
+    @ApiParam("车辆类型")
+    private String carType;
+
+    @Column(name = "CAR_COLOR")
+    @ApiParam("车辆颜色")
+    private String carColor;
+
+    @Column(name = "PART_CODE")
+    @ApiParam("零件号")
+    private String partCode;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name = "CAR_CONFIG")
+    @ApiParam("配置")
+    private String carConfig;
+
+    @Column(name = "CAR_LEVEL")
+    @ApiParam("等级")
+    private String carLevel;
+
+    @Column(name = "PART_COLOR")
+    @ApiParam("零件颜色")
+    private String partColor;
+
+}

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

@@ -0,0 +1,65 @@
+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:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_TOPIC_SETTING")
+@Api("MES_盲检问题设置")
+public class MesBlindTopicSetting extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601497L;
+
+    @Column(name = "TOPIC_ID")
+    @ApiParam("序号")
+    private String topicId;
+
+    @Column(name = "TOPIC_CODE")
+    @ApiParam("题目编号")
+    private String topicCode;
+
+    @Column(name = "TOPIC_DESC")
+    @ApiParam("题目描述")
+    private String topicDesc;
+
+    @Column(name = "TOPIC_OBJECT")
+    @ApiParam("零件名称")
+    private String topicObject;
+
+    @Column(name = "TOPIC_TYPE")
+    @ApiParam("盲检类型")
+    private Integer topicType;
+
+    @Column(name = "QTY")
+    @ApiParam("答案数量")
+    private Integer qty;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("文件id")
     private Long fileId;
 
+    @Column(name = "ESOP_URL")
+    @ApiParam("文件路径")
+    private String esopUrl;
+
     @Transient
     @ApiParam("文件名称")
     private String fileName;
@@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("同步标记")
     private Integer syncTag = 0;
 
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 }

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

@@ -0,0 +1,81 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:20 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_GUN_CALIBRATION_RECORD")
+@Api("校枪记录表")
+public class MesGunCalibrationRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6166370020956801528L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "GUN_CODE")
+    @ApiParam("枪号")
+    private String gunCode;
+
+    @Column(name = "CUN_TYPE")
+    @ApiParam("扭矩枪类型")
+    private String cunType;
+
+    @Column(name = "PSET_CODE")
+    @ApiParam("PSET号")
+    private String psetCode;
+
+    @Column(name = "EXPECT_COUNT")
+    @ApiParam("设定枪数")
+    private Integer expectCount;
+
+    @Column(name = "REAL_COUNT")
+    @ApiParam("实际枪叔")
+    private Integer realCount;
+
+    @Column(name = "CALIBRATION_STATUS")
+    @ApiParam("校枪状态")
+    private Integer calibrationStatus;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始校枪时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束校枪时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("校枪状态名称")
+    private String calibrationStatusName;
+
+    @Transient
+    @ApiParam("界面编号")
+    private String windowNo;
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @Description : 盲检问题清单
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检问题清单",description = "盲检问题清单")
+public class MesBlindProbleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844345L;
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "提问内容")
+    private String questionContents;
+
+    @ApiParam(value = "答案集合")
+    private List<String> answerList;
+
+    @ApiParam(value = "正确答案")
+    private String rightKey;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 盲检规则模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检规则模板",description = "盲检规则模板")
+public class MesBlindRuleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844321L;
+    @ApiParam(value = "车辆类型")
+    @AnnoOutputColumn
+    private String carType;
+
+    @ApiParam(value = "车辆颜色")
+    @AnnoOutputColumn
+    private String carColor;
+
+    @ApiParam(value = "零件号")
+    private String partCode;
+
+    @ApiParam(value = "零件名称")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam(value = "配置")
+    @AnnoOutputColumn
+    private String carConfig;
+
+    @ApiParam(value = "等级")
+    @AnnoOutputColumn
+    private String carLevel;
+
+    @ApiParam(value = "零件颜色")
+    @AnnoOutputColumn
+    private String partColor;
+
+    @ApiParam(value = "下标")
+    @AnnoOutputColumn
+    private Integer index;
+
+}

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

@@ -132,6 +132,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户工厂代码")
     private String customerFactoryCode;
 
+    @ApiParam("工步弹框参数")
+    private String stepDialogParam;
+
+    @ApiParam("工步弹框状态")
+    private Boolean stepDialogStatus = false;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -52,4 +52,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("多个数据集")
     private List<StationResultBean<T>> stationResultBeans;
+
+    @ApiParam("定制页面名称")
+    private String customPageName;
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindHistoryRepository extends BaseRepository<MesBlindHistory, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindRule;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindRuleRepository extends BaseRepository<MesBlindRule, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindTopicSettingRepository extends BaseRepository<MesBlindTopicSetting, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesGunCalibrationRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:39 下午
+ * @Modify:
+ */
+public interface MesGunCalibrationRecordRepository extends BaseRepository<MesGunCalibrationRecord, Long> {
+}

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

@@ -2887,4 +2887,53 @@ public class MesHqlPack {
         getStringBuilderPack(details, result);
         return result;
     }
+
+//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
+//    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
+    /**
+     * MES 校枪记录
+     *
+     * @param gunCalibrationRecord
+     * @return
+     */
+    public static DdlPackBean getMesGunCalibrationRecord(MesGunCalibrationRecord gunCalibrationRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(gunCalibrationRecord, organizeCode);
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getGunCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getGunCode(), "gunCode", packBean);
+        }
+        if (gunCalibrationRecord.getCalibrationStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(gunCalibrationRecord.getCalibrationStatus(), "calibrationStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringBiggerPack(gunCalibrationRecord.getStartTime(), "startTime", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(gunCalibrationRecord.getEndTime(), "endTime", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -63,7 +62,7 @@ public class TorqueCollectionModel implements Serializable {
     private Integer pest8;
 
     @ApiParam("扭矩枪编号")
-    private String torqueNo;
+    private Integer torqueNo;
 
     @ApiParam("PEST号")
     private Integer pestNum;
@@ -101,10 +100,60 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("组合码")
     private String groupCode;
 
+    /**
+     * 大枪查询结果构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param torqueNo
+     * @param checkScanCount
+     * @param sendSeq
+     * @param yellowGunRule
+     * @param isEndSeq
+     * @param groupCode
+     */
+    public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
+                                 String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
+                                 Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+        this.vinCode = vinCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.gradeCode = gradeCode;
+        this.colorCode = colorCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.torqueNo = torqueNo;
+        this.checkScanCount = checkScanCount;
+        this.sendSeq = sendSeq;
+        this.yellowGunRule = yellowGunRule;
+        this.isEndSeq = isEndSeq;
+        this.groupCode = groupCode;
+    }
+
+    /**
+     * 小枪结果数据构造方法
+     * @param vinCode
+     * @param prodCfgTypeCode
+     * @param gradeCode
+     * @param colorCode
+     * @param partNo
+     * @param partName
+     * @param pest1
+     * @param pest2
+     * @param pest3
+     * @param pest4
+     * @param pest5
+     * @param pest6
+     * @param pest7
+     * @param pest8
+     * @param torqueNo
+     */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
                                  String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
                                  Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
-                                 String torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+                                 Integer torqueNo) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -120,10 +169,5 @@ public class TorqueCollectionModel implements Serializable {
         this.pest7 = pest7;
         this.pest8 = pest8;
         this.torqueNo = torqueNo;
-        this.checkScanCount = checkScanCount;
-        this.sendSeq = sendSeq;
-        this.yellowGunRule = yellowGunRule;
-        this.isEndSeq = isEndSeq;
-        this.groupCode = groupCode;
     }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -31,6 +31,14 @@ import javax.persistence.Version;
 public class SwebDocMovementDetails extends BaseBean {
     private static final long serialVersionUID = -1232334350341792942L;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "DEST_AREA_NO")
     @ApiParam("目的库存地代码")
     public String destAreaNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java

@@ -91,9 +91,13 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam(value = "关联单据")
     private String refNo;
 
-    @Column(name = "VENDOR_NO")
-    @ApiParam(value = "供应商编号")
-    private String vendorNo;
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本", example = "1")
@@ -111,7 +115,7 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam("打印状态")
     private Integer printStatus;
 
-    @Column(name = "PRINT_STATUS")
+    @Column(name = "IS_SN")
     @ApiParam("打印状态")
     private Integer isSn;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -74,4 +74,12 @@ public class SwebDocMovementSn extends BaseBean {
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型")
     private Integer snType;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -175,6 +175,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }
@@ -182,6 +183,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(details, result);
     }

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToSweb extends BaseBean {
+    private static final long serialVersionUID = 49215041475324487L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam(value = "计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,95 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToWms extends BaseBean {
+    private static final long serialVersionUID = -8089219927352225317L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToSweb extends BaseBean {
+    private static final long serialVersionUID = 4710841067412420270L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,93 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+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.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToWms extends BaseBean {
+
+    private static final long serialVersionUID = -3999194389200855165L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    private Double qty;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商")
+    private String vendorNo;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "0")
+    private Double printQty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Column(name = "ERP_AREA_NO")
+    @ApiParam("默认收货库存地")
+    private String erpAreaNo;
+
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @ApiParam("标准包装")
+    private Double snp;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}