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

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

@@ -435,6 +435,35 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
         this.andonCount = andonCount;
     }
 
+    /**
+     * 工位统计报表查询 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellNameRdd,String workCellCode,
+                            String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                            String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+
     public static void main(String[] args) {
         try {
             List ds = new ArrayList();

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java

@@ -20,4 +20,5 @@ import javax.persistence.Table;
 @Table(name = "APS_FLUSH_PLAN_RULE")
 @Api("刷新计划规则")
 public class FlushPlanRule extends BaseRule {
+    private static final long serialVersionUID = 4973034215598612466L;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EImportDetail;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -13,6 +14,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :数据导入明细
@@ -29,6 +31,22 @@ import javax.persistence.Table;
 public class ImportDetail extends BaseAPS {
 
     private static final long serialVersionUID = 1264030397500660450L;
+
+    @Column(name="group_Name")
+    @ApiParam(value ="组名称")
+    @FieldAnnotation(notEmpty = true)
+    private String groupName;
+
+    @Column(name="LINK_TYPE")
+    @ApiParam(value ="链接类型")
+    @FieldAnnotation(defaultValue = "EXCEL")
+    private ApsEnumUtil.DATA_LINK_TYPE linkType;
+
+    @Column(name="PATH")
+    @ApiParam(value ="IP/文件路径")
+    @FieldAnnotation(notEmpty = true)
+    private String path;
+
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;
@@ -37,6 +55,22 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
+    @Column(name="PORT")
+    @ApiParam(value ="端口")
+    private Integer port;
+
+    @Column(name="DB_NAME")
+    @ApiParam(value ="数据库名")
+    private String dbName;
+
+    @Column(name="USER_NAME")
+    @ApiParam(value ="用户名")
+    private String userName;
+
+    @Column(name="PASSWORD")
+    @ApiParam(value ="密码")
+    private String password;
+
     @Column(name="IMPORT_TYPE")
     @ApiParam(value ="导入类型")
     @FieldAnnotation(defaultValue = "REPLACE")
@@ -65,4 +99,9 @@ public class ImportDetail extends BaseAPS {
         this.projectId = project != null ? project.getId() : 0l;
         BeanRelation.set(this, EImportDetail.Project, project);
     }
+
+    @JsonBackReference
+    public List<ImportField> getFields() {
+        return BeanRelation.list(this, EImportDetail.Fields);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.Date;
 
 /**
  * @Description :库存
@@ -45,6 +46,22 @@ public class Inventory extends BaseOrder {
     @FieldAnnotation(modify = false)
     private Double excessCount;
 
+    @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="单次补充数量")
+    private Double singleSupplyCount;
+
+    @Column(name="SAFE_COUNT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="安全库存数量")
+    private Double safeCount;
+
+    @Column(name="SUPPLY_INTERVAL")
+    @ApiParam(value ="补充间隔（天）")
+    private Integer supplyInterval;
+
+    @Column(name="LAST_SUPPLY")
+    @ApiParam(value ="最后补充时间")
+    private Date lastSupply;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java

@@ -37,6 +37,14 @@ public class MatCalcRule extends BaseRule {
     @ApiParam(value ="输出筛选")
     private String outputFilter;
 
+    @Column(name="INPUT_MATCH")
+    @ApiParam(value ="输入匹配")
+    private String inputMatch;
+
+    @Column(name="OUTPUT_MATCH")
+    @ApiParam(value ="输出匹配")
+    private String outputMatch;
+
     @Column(name="DEL_AUTO")
     @ApiParam(value ="自动删除补充订单")
     @FieldAnnotation(defaultValue = "1")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@@ -60,6 +61,11 @@ public class Material extends BaseAPS {
     @FieldAnnotation(defaultValue = "ONEBYONE")
     private ApsEnumUtil.REPLENISHMENT_TYPE replType;
 
+    @Column(name="GROUP_ID")
+    @ApiParam(value ="物料组")
+    @FieldAnnotation(relation = "Material")
+    private Long groupId;
+
     @Column(name="PURCHASE_LEAD_TIME")
     @ApiParam(value ="采购提前期")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
@@ -151,6 +157,18 @@ public class Material extends BaseAPS {
     @ApiParam(value ="标签颜色")
     private String labelColor;
 
+    public Material getGroup() {
+        return BeanRelation.get(this, EMaterial.Group);
+    }
+
+    public void setGroup(Material material) {
+        this.groupId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EMaterial.Group, material);
+    }
+
+    @JsonBackReference
+    public List<Material> getChilds() { return BeanRelation.list(this, EMaterial.Childs); }
+
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java

@@ -26,7 +26,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
-@Api("物料")
+@Api("物料交期承诺")
 public class MaterialDeliveryPromise extends BaseBean {
     @Column(name="QTY")
     @ApiParam(value ="到货数量")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java

@@ -32,12 +32,12 @@ public class MaterialSetTime extends BaseAPS {
     private String resCode;
 
     @Column(name="PREV_MATERIAL")
-    @ApiParam(value ="前物料")
+    @ApiParam(value ="前物料编码")
     @FieldAnnotation(notEmpty = true)
     private String prevMaterial;
 
     @Column(name="POST_MATERIAL")
-    @ApiParam(value ="后物料")
+    @ApiParam(value ="后物料编码")
     @FieldAnnotation(notEmpty = true)
     private String postMaterial;
 
@@ -49,5 +49,5 @@ public class MaterialSetTime extends BaseAPS {
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
     @FieldAnnotation(defaultValue = "10")
-    private int priority;
+    private Integer priority;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -117,16 +117,6 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeTailRound;
 
-    @Column(name="LOCK_TYPE")
-    @ApiParam(value ="锁定类型")
-    @FieldAnnotation(defaultValue = "NONE")
-    private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType;
-
-    @Column(name="LOCK_TIME")
-    @ApiParam(value ="锁定时间长度")
-    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
-    private String lockTime;
-
     @ApiParam(value ="是否存在任务冲突")
     @FieldAnnotation(property = false)
     @Transient

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -65,9 +65,4 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
     private ApsEnumUtil.RES_COMB_TIME_TYPE combType;
-
-    @Column(name="LOCK_TYPE")
-    @ApiParam(value ="锁定组合方式")
-    @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
-    private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -99,22 +99,6 @@ public class WorkPlan extends BaseAPS {
     @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer postSetTime;
 
-    @Column(name="LOCK_BEGIN")
-    @ApiParam(value ="锁定开始时间")
-    @FieldAnnotation(modify = false)
-    @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock")
-    private Date lockBegin;
-
-    @Column(name="LOCK_END")
-    @ApiParam(value ="锁定结束时间")
-    @FieldAnnotation(modify = false)
-    private Date lockEnd;
-
-    @Column(name="LOCK_TIME")
-    @ApiParam(value ="锁定时间")
-    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
-    private Integer lockTime;
-
     @Column(name="FORCE_POST_SET_ZERO")
     @ApiParam(value ="是否将后设置时间强制设置成0")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java

@@ -44,4 +44,18 @@ public abstract class BaseAPS extends BaseBean {
     public void setCustomField(String code, Object value) {
         customFields.put(code, value);
     }
+
+    public Integer getCustomInteger(String code) {
+        Object value = customFields.get(code);
+        if (value == null) {
+            return null;
+        }
+
+        if (value.getClass() == String.class) {
+            return Integer.valueOf((String) value);
+        } else if(value.getClass() == Integer.class) {
+            return (Integer)value;
+        }
+        return null;
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EImportDetail {
-    Project
+    Project,
+    Fields
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EMaterial {
+    Group,
+    Childs,
     ProductRoutings,
     OperInputs,
     OperOutputs,

modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml

@@ -2,4 +2,6 @@
 <Class name="Material">
 <Relation field="ProductRoutings" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
 </Relation>
+    <Relation field="Childs" name="Material" reverse="Group" type="ONE_TO_MULTI" owner="false">
+    </Relation>
 </Class>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java

@@ -23,48 +23,48 @@ public class BaseThreadLocal {
             return new HashMap<String,Object>();
         }
     };*/
-    private static final ThreadLocal<HashMap<String,Object>> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>());
+    private static final ThreadLocal<HashMap<String, Object>> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>());
 
     public static Object getData(String key) {
-        if(DATA_THREAD_LOCAL.get() != null) {
+        if (DATA_THREAD_LOCAL.get() != null) {
             return DATA_THREAD_LOCAL.get().get(key);
-        }else{
+        } else {
             return null;
         }
     }
 
     public static String getDataStr(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return data.toString();
-        }else{
+        } else {
             return null;
         }
     }
 
     public static int getDataInt(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Integer.parseInt(data.toString());
-        }else{
+        } else {
             return 0;
         }
     }
 
     public static long getDataLong(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Long.parseLong(data.toString());
-        }else{
+        } else {
             return 0L;
         }
     }
 
     public static double getDataDouble(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Double.parseDouble(data.toString());
-        }else{
+        } else {
             return 0.0;
         }
     }
@@ -78,8 +78,8 @@ public class BaseThreadLocal {
      * 手动再次清除线程变量
      * 需要在方法后调用，或者通过ascept拦截后进行清空
      */
-    public static void removeThreadLocal(){
-        if(DATA_THREAD_LOCAL != null) {
+    public static void removeThreadLocal() {
+        if (DATA_THREAD_LOCAL != null) {
             if (DATA_THREAD_LOCAL.get() != null) {
                 //清空数据
                 DATA_THREAD_LOCAL.get().clear();
@@ -89,16 +89,16 @@ public class BaseThreadLocal {
         }
     }
 
-    public static String getInfo(){
+    public static String getInfo() {
         Thread thread = Thread.currentThread();
         return "thead-id:" + thread.getId() + ",thread:" + thread;
     }
 
-    public static void printDetail(){
+    public static void printDetail() {
         LOGGER.info("========本地线程临时数据=======");
         LOGGER.info("数据数量：{}", DATA_THREAD_LOCAL.get().size());
-        for(String key : DATA_THREAD_LOCAL.get().keySet()){
-            LOGGER.info("key:{},value:{}",key, DATA_THREAD_LOCAL.get().get(key));
+        for (String key : DATA_THREAD_LOCAL.get().keySet()) {
+            LOGGER.info("key:{},value:{}", key, DATA_THREAD_LOCAL.get().get(key));
         }
     }
 
@@ -107,18 +107,22 @@ public class BaseThreadLocal {
     public static final String EMP_NAME = "USER_NAME";    //用户名
     public static final String ORGANIZE_CODE = "ORGANIZE_CODE";    //组织代码
     public static final String LANGUAGE_CODE = "LANGUAGE_CODE";    //语言代码
+    /**
+     * 单点登录标志
+     */
+    public static final String OSS_LOGIN = "OSS_LOGIN";
 
-    public static boolean isInit(){
+    public static boolean isInit() {
         Object data = getData(INIT_INFO);
-        if(data != null){
+        if (data != null) {
             return Boolean.parseBoolean(data.toString());
-        }else{
+        } else {
             return false;
         }
     }
 
     //初始化用户数据
-    public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){
+    public static void initSessionUserThreadLocal(String empName, String organizeCode, String languageCode) {
         setData(BaseThreadLocal.EMP_NAME, empName);
         setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode);
         setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
@@ -126,25 +130,27 @@ public class BaseThreadLocal {
     }
 
     //获取线程中的人员姓名
-    public static String getThreadEmpName(){
+    public static String getThreadEmpName() {
         String empName = getDataStr(EMP_NAME);
-        if(empName == null){
+        if (empName == null) {
             empName = "系统";
         }
         return empName;
     }
+
     //获取线程中的组织代码
-    public static String getThreadOrganizeCode(){
+    public static String getThreadOrganizeCode() {
         String organizeCode = getDataStr(ORGANIZE_CODE);
-        if(organizeCode == null){
+        if (organizeCode == null) {
             organizeCode = "-1";
         }
         return organizeCode;
     }
+
     //获取线程中的语言代码
-    public static String getThreadLanguageCode(){
+    public static String getThreadLanguageCode() {
         String organizeCode = getDataStr(LANGUAGE_CODE);
-        if(organizeCode == null){
+        if (organizeCode == null) {
             organizeCode = "CN/zh";
         }
         return organizeCode;

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

@@ -471,32 +471,6 @@ public class ApsEnumUtil {
     }
 
     /**
-     * 锁定时间计算方式
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RES_COMB_LOCK_TYPE {
-        KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"),
-        MAIN_LOCK("MAIN_LOCK", "主资源锁定"),
-        MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间");
-
-        private String value;
-        private String description;
-
-        RES_COMB_LOCK_TYPE(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-    }
-
-    /**
      * 生产时间计算方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -958,8 +932,7 @@ public class ApsEnumUtil {
     public enum PLAN_TYPE {
         PREV_SET("", "前设置"),
         PRODUCE("", "生产"),
-        POST_SET("", "后设置"),
-        LOCK("", "锁定");
+        POST_SET("", "后设置");
 
         private String value;
         private String description;

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

@@ -20,20 +20,28 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        /** WMS 服务 */
+        /**
+         * WMS 服务
+         */
         WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
         SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
         QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
 
-        /** Mes 服务 */
+        /**
+         * Mes 服务
+         */
         MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"),
         MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"),
 
-        /** PTL 服务 */
+        /**
+         * PTL 服务
+         */
         PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"),
         PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
 
-        /** Block 服务 */
+        /**
+         * Block 服务
+         */
         FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"),
         REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"),
         WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"),
@@ -41,42 +49,66 @@ public class CommonEnumUtil {
         SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"),
         HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"),
 
-        /** LAC 服务 */
+        /**
+         * LAC 服务
+         */
         LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"),
 
-        /** 安灯服务 */
+        /**
+         * 安灯服务
+         */
         ANDON(27, 8500, 14, 110000000L, "andon", "安灯"),
 
-        /** 计划排产服务 */
+        /**
+         * 计划排产服务
+         */
         APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
         SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
 
-        /** 基础服务 */
+        /**
+         * 基础服务
+         */
         IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"),
         CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"),
         GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
         CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
         CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
 
-        /** 平台服务 */
+        /**
+         * 平台服务
+         */
         CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
         MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"),
 
-        /** 调试服务 */
+        /**
+         * 调试服务
+         */
         DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
 
 
-        /** 产品ID */
+        /**
+         * 产品ID
+         */
         private int value;
-        /** 应用默认端口 */
+        /**
+         * 应用默认端口
+         */
         private int port;
-        /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */
+        /**
+         * 应用默认雪花DataBaseId(0-31)共32 个存储区
+         */
         private int snowflakeId;
-        /** 产品代码 */
+        /**
+         * 产品代码
+         */
         private String code;
-        /** 顶级菜单代码 */
+        /**
+         * 顶级菜单代码
+         */
         private long menuRootId;
-        /** 产品描述 */
+        /**
+         * 产品描述
+         */
         private String description;
 
         SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) {
@@ -177,6 +209,7 @@ public class CommonEnumUtil {
             }
             return null;
         }
+
         public synchronized static int descriptionOfValue(String desc) {
             int tmp = IMPP.value;
             for (int i = 0; i < values().length; i++) {
@@ -187,6 +220,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = IMPP.value;
             for (int i = 0; i < values().length; i++) {
@@ -253,7 +287,7 @@ public class CommonEnumUtil {
             return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
-        public static TRUE_OR_FALSE valueOfEnum(int value){
+        public static TRUE_OR_FALSE valueOfEnum(int value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
                     return values()[i];
@@ -262,13 +296,18 @@ public class CommonEnumUtil {
             return null;
         }
 
-        public static String valueOfDescription(int val) {return valueOf(val);}
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
 
         public static boolean valueOfBoolean(int val) {
-            if(val == TRUE.value){
+            if (val == TRUE.value) {
                 return true;
-            }else {
+            } else {
                 return false;
             }
         }
@@ -348,6 +387,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = COMMON.value;
             for (int i = 0; i < values().length; i++) {
@@ -357,9 +397,11 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
+
         public static int descriptionOfValue(String val) {
             return descOf(val);
         }
@@ -453,7 +495,7 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_STATUS {
-//        EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
+        //        EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
 //        FREEZE(2, "冻结", "冻结_FREEZE"),
 //        ABERRANT(3, "异常", "异常_ABERRANT"),
 //        RESIGNATION(4, "离职", "离职_RESIGNATION"),
@@ -508,6 +550,7 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 数据类型
      * 1库存移动数据
@@ -569,6 +612,7 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_INFO_STATUS {
         INCUMBENT(1, "正常", "正常_NORMAL"),
@@ -619,9 +663,9 @@ public class CommonEnumUtil {
 
     /**
      * 数据状态
-     *  1 启用
-     *  2 禁用
-     *  3 锁定
+     * 1 启用
+     * 2 禁用
+     * 3 锁定
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
@@ -711,7 +755,7 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static METHOD_LEVEL get(int id){
+        public static METHOD_LEVEL get(int id) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == id) {
                     return values()[i];
@@ -805,9 +849,9 @@ public class CommonEnumUtil {
     /**
      * 父节点配置
      */
-    public enum PARENT{
+    public enum PARENT {
 
-        DEFAULT(-1L,"根节点");
+        DEFAULT(-1L, "根节点");
 
         private Long value = -1L;
         private String description = null;
@@ -876,9 +920,9 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CLOUD_APP_STATUS {
-        UP(1,"UP" ,"在线"),
-        DOWN(2, "DOWN","断线"),
-        RESTRICTED(3,"RESTRICTED" ,"受限");
+        UP(1, "UP", "在线"),
+        DOWN(2, "DOWN", "断线"),
+        RESTRICTED(3, "RESTRICTED", "受限");
 
         private int value;
         private String code;
@@ -991,6 +1035,7 @@ public class CommonEnumUtil {
 
         /**
          * -1 未识别操作系统
+         *
          * @param desc
          * @return
          */
@@ -1051,6 +1096,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -1092,6 +1138,7 @@ public class CommonEnumUtil {
             this.value = value;
             this.description = description;
         }
+
         public static CONTENT_TYPE valueOfContenType(String val) {
             CONTENT_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1128,10 +1175,10 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HTTP_METHOD_TYPE {
-        GET(1,"GET" ,"GET"),
-        POST(2, "POST","POST"),
-        DELETE(3, "DELETE","DELETE"),
-        PUT(4, "PUT","PUT");
+        GET(1, "GET", "GET"),
+        POST(2, "POST", "POST"),
+        DELETE(3, "DELETE", "DELETE"),
+        PUT(4, "PUT", "PUT");
 
         private int value;
         private String code;
@@ -1210,13 +1257,13 @@ public class CommonEnumUtil {
      * 变量类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum  BASIS_TYPE {
+    public enum BASIS_TYPE {
         INT(1, "int"),
         DOUBLE(2, "double"),
         LONG(3, "long"),
         FLOAT(4, "float"),
         CHAR(5, "char"),
-        BOOLEAN(6,"boolean"),
+        BOOLEAN(6, "boolean"),
         BYTE(7, "byte"),
         SHORT(8, "short");
 
@@ -1329,14 +1376,14 @@ public class CommonEnumUtil {
         TEXT(200, "TEXT", "文本"),
         NUMBER(210, "NUMBER", "数字"),
         PASSWORD(230, "PASSWORD", "密码"),
-        DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
+        DATE_TIME(300, "DATE", "日期", SQL_WHERE.BETWEEN),
         //        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
 //        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
         //        ELEMENT(700, "DICT_SELECT", "元素"),
         DICTIONARY(800, "DICT_SELECT", "字典"),
         CASCADE(900, "CASCADE", "级联"),
         PICK_UP(1000, "PICK_UP", "拾取"),
-        INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL);
+        INTERVAL(1100, "INTERVAL", "区间", SQL_WHERE.INTERVAL);
         //FILE(400, "file", "文件"),
         //IMAGE(410, "image", "image"),
         //OFF(500, "color", "颜色"),
@@ -1440,7 +1487,7 @@ public class CommonEnumUtil {
         MORE(20, " > ", "大于"),
         LESS(30, " < ", "小于"),
         MORE_OR_EQUAL(21, " >= ", "大于等于"),
-        LESS_OR_EQUAL (31, " <= ", "小于等于"),
+        LESS_OR_EQUAL(31, " <= ", "小于等于"),
         LIKE(40, " LIKE ", "全模糊"),
         START_LIKE(41, " LIKE ", "前模糊"),
         END_LIKE(52, " LIKE ", "后模糊"),
@@ -1531,7 +1578,7 @@ public class CommonEnumUtil {
         private int value;
         private String description;
 
-        private MiSS_RESOURCE_SOURCE(int value,  String description) {
+        private MiSS_RESOURCE_SOURCE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1606,7 +1653,7 @@ public class CommonEnumUtil {
          */
         private Class clzFullName;
         /**
-         *  属性类型 对应的 控件类型
+         * 属性类型 对应的 控件类型
          */
         private PROPERTY_CONTROL_TYPE controlType;
         /**
@@ -1622,8 +1669,8 @@ public class CommonEnumUtil {
          */
         private String defaultValue;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1633,8 +1680,8 @@ public class CommonEnumUtil {
             this.defaultWhere = defaultWhere;
         }
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1646,8 +1693,8 @@ public class CommonEnumUtil {
             this.defaultFormat = defaultFormat;
         }
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue, String defaultFormat) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1813,11 +1860,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_SOURCE_TYPE {
-        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
-        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
-        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
-        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
-        SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"),
+        SOURCE_SAP_HANA(500, "SapHana", "SapHana", "com.sap.db.jdbc.Driver", 39015, null);
 
         private int value;
         private String code;
@@ -1826,7 +1873,7 @@ public class CommonEnumUtil {
         private int defaultPort;
         private String defaultSchemaPattern;
 
-        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
+        private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1910,51 +1957,51 @@ public class CommonEnumUtil {
         }
 
         public String getSchemaPattern(String schema) {
-            if(this.equals(SOURCE_SAP_HANA)){
+            if (this.equals(SOURCE_SAP_HANA)) {
                 return schema;
             }
             return defaultSchemaPattern;
         }
 
-        public String getJDBCUrl(String database,String host,Integer port){
-            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
-                return getJDBCUrlMySQL(database,host,port);
-            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
-                return getJDBCUrlOracle(database,host,port);
-            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
-                return getJDBCUrlPostgreSQL(database,host,port);
-            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
-                return getJDBCUrlSQLServer(database,host,port);
-            }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){
-                return getJDBCUrlSapHana(database,host,port);
+        public String getJDBCUrl(String database, String host, Integer port) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQL(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                return getJDBCUrlPostgreSQL(database, host, port);
+            } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
+                return getJDBCUrlSQLServer(database, host, port);
+            } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) {
+                return getJDBCUrlSapHana(database, host, port);
             }
             return null;
         }
 
-        public String getJDBCUrl(String database,String host,Integer port,String instanceName){
-            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
-                return getJDBCUrlMySQL(database,host,port);
-            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
-                return getJDBCUrlOracle(database,host,port);
-            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
-                return getJDBCUrlPostgreSQL(database,host,port);
-            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
-                return getJDBCUrlSQLServer(database,host,port,instanceName);
+        public String getJDBCUrl(String database, String host, Integer port, String instanceName) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQL(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                return getJDBCUrlPostgreSQL(database, host, port);
+            } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
+                return getJDBCUrlSQLServer(database, host, port, instanceName);
             }
             return null;
         }
 
-        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
-            if(StringUtils.isNotBlank(databaseProductName)){
-                if(databaseProductName.indexOf(":mysql:") != -1){
+        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) {
+            if (StringUtils.isNotBlank(databaseProductName)) {
+                if (databaseProductName.indexOf(":mysql:") != -1) {
                     return SOURCE_MARIA_DB;
-                }else if(databaseProductName.indexOf(":oracle:") != -1){
+                } else if (databaseProductName.indexOf(":oracle:") != -1) {
                     return SOURCE_ORACLE;
-                }else if(databaseProductName.indexOf(":postgresql:") != -1){
+                } else if (databaseProductName.indexOf(":postgresql:") != -1) {
                     return SOURCE_POSTGRE_SQL;
-                }else if(databaseProductName.indexOf(":sqlserver:") != -1){
+                } else if (databaseProductName.indexOf(":sqlserver:") != -1) {
                     return SOURCE_SQL_SERVER;
-                }else if(databaseProductName.indexOf(":sap:") != -1){
+                } else if (databaseProductName.indexOf(":sap:") != -1) {
                     return SOURCE_SAP_HANA;
                 }
             }
@@ -1963,9 +2010,9 @@ public class CommonEnumUtil {
 
 
         // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest
-        private String getJDBCUrlMySQL(String database,String host,Integer port){
+        private String getJDBCUrlMySQL(String database, String host, Integer port) {
             // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
-            return "jdbc:mysql://"+host+":"+port+"/"+database+
+            return "jdbc:mysql://" + host + ":" + port + "/" + database +
                     "?autoReconnect=true" +
                     "&useSSL=false" +
                     "&characterEncoding=utf-8" +
@@ -1973,23 +2020,23 @@ public class CommonEnumUtil {
                     "&serverTimezone=CST";
         }
 
-        private String getJDBCUrlOracle(String database,String host,Integer port){
-            return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
+        private String getJDBCUrlOracle(String database, String host, Integer port) {
+            return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database;
         }
 
-        private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
-            return "jdbc:postgresql://"+host+":"+port+"/"+database;
+        private String getJDBCUrlPostgreSQL(String database, String host, Integer port) {
+            return "jdbc:postgresql://" + host + ":" + port + "/" + database;
         }
 
-        private String getJDBCUrlSQLServer(String database,String host,Integer port){
-            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
+        private String getJDBCUrlSQLServer(String database, String host, Integer port) {
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database + ";autoReconnect=true";
         }
 
-        private String getJDBCUrlSapHana(String database,String host,Integer port){
+        private String getJDBCUrlSapHana(String database, String host, Integer port) {
             return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
         }
 
-        private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
+        private String getJDBCUrlSQLServer(String database, String host, Integer port, String instanceName) {
             StringBuffer sb = new StringBuffer();
             sb.append("jdbc:sqlserver://").append(host);
             // 实例
@@ -2010,7 +2057,7 @@ public class CommonEnumUtil {
      * 变量类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum  LICENSE_SOURCE {
+    public enum LICENSE_SOURCE {
         LOCAL_SYSTEM_FILE(1, "本地文件"),
         NETWORK_ESTSH(2, "网络-官方授权"),
         SENSE_HARDWARE_USB_LOCK(3, "硬件锁"),
@@ -2102,8 +2149,8 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ACTUATOR_ENV_PATH {
-        PID(1,"/PID" ,"PID"),
-        JAVA_VERSION(2, "/java.version","jdk版本");
+        PID(1, "/PID", "PID"),
+        JAVA_VERSION(2, "/java.version", "jdk版本");
 
         private int value;
         private String path;
@@ -2202,7 +2249,7 @@ public class CommonEnumUtil {
             this.description = description;
         }
 
-        private ACTUATOR_METRICS_INFO(int value, String path, String tag,  String description) {
+        private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) {
             this.value = value;
             this.path = path;
             this.tag = tag;
@@ -2216,6 +2263,7 @@ public class CommonEnumUtil {
         public String getPath() {
             return path;
         }
+
         public String getTag() {
             return tag;
         }
@@ -2276,7 +2324,7 @@ public class CommonEnumUtil {
         private String code;
         private String description;
 
-        private DATA_SOURCE_STATUS (int value, String code, String description) {
+        private DATA_SOURCE_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -2295,7 +2343,6 @@ public class CommonEnumUtil {
         }
 
 
-
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2466,7 +2513,6 @@ public class CommonEnumUtil {
     }
 
 
-
     /**
      * 业务表：库存条码质检状态
      */
@@ -2589,7 +2635,7 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DYNAMIC_DATA_SOURCE_TYPE {
-        MASTER,NODE
+        MASTER, NODE
     }
 
     /**
@@ -2687,5 +2733,4 @@ public class CommonEnumUtil {
     }
 
 
-
 }

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

@@ -445,7 +445,7 @@ public class ImppEnumUtil {
         MESSAGE_SEND_STATUS() {
         }
 
-        MESSAGE_SEND_STATUS(int value,  String description) {
+        MESSAGE_SEND_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1032,10 +1032,10 @@ public class ImppEnumUtil {
         REF_OBJECT(3, "对象"),
         REF_DICT(4, "字典");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
-        private COL_REF_TYPE(int value, String description) {
+        COL_REF_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1084,8 +1084,8 @@ public class ImppEnumUtil {
         WORK_WECHAT(8, "企业微信配置"),
         SMS(9, "短信配置");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1095,7 +1095,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private SYS_CONFIG_GROUP(int value, String description) {
+        SYS_CONFIG_GROUP(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1118,8 +1118,8 @@ public class ImppEnumUtil {
         EXTERNAL(2, "外部人员"),
         URGENT(3, "紧急联系人"),
         SUPPLIER(4, "供应商");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1129,7 +1129,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private MESSAGE_RECEIVER_TYPE(int value, String description) {
+        MESSAGE_RECEIVER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1222,8 +1222,8 @@ public class ImppEnumUtil {
     public enum DICTIONARY_GROUP {
         SYSTEM(1, "系统字典"),
         EXTERNAL(2, "业务字典");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1233,7 +1233,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private DICTIONARY_GROUP(int value, String description) {
+        DICTIONARY_GROUP(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1254,10 +1254,10 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_STORAGE {
-//        MONGO(1, "MongoDB"),
+        //        MONGO(1, "MongoDB"),
         ELASTICSEARCH(2, "Elasticsearch");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1267,7 +1267,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private LOG_STORAGE(int value, String description) {
+        LOG_STORAGE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1299,8 +1299,8 @@ public class ImppEnumUtil {
     public enum CHECK_TEXT {
         PASSWORD_VERIFY(1, "保存策略"),
         PASSWORD_LOGIN(2, "登录策略");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1310,7 +1310,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private CHECK_TEXT(int value, String description) {
+        CHECK_TEXT(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1342,8 +1342,8 @@ public class ImppEnumUtil {
     public enum USER_CUSTOMIZE_CONFIG_TYPE {
         WEB_TABLE_SHOW_COL(10, "前端表格显示列");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
             this.value = value;
@@ -1387,8 +1387,8 @@ public class ImppEnumUtil {
     public enum USER_EXTERNAL_REF {
         WORK_WECHAT(10, "企业微信");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         USER_EXTERNAL_REF(int value, String description) {
             this.value = value;
@@ -1429,7 +1429,7 @@ public class ImppEnumUtil {
      * 用户绑定属性
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum USER_BIND_PROPERTY{
+    public enum USER_BIND_PROPERTY {
         USER_LOGIN_NAME("userId", "登录名称"),
         USER_NAME("userName", "用户名称"),
         EMAIL("email", "邮箱"),
@@ -1437,10 +1437,10 @@ public class ImppEnumUtil {
         USER_EMP_NO("empNo", "工号"),
         USER_WECHAT_NO("userWeChatNo", "微信号");
 
-        private String value;
-        private String description;
+        private final String value;
+        private final String description;
 
-        private USER_BIND_PROPERTY(String value, String description) {
+        USER_BIND_PROPERTY(String value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1476,6 +1476,7 @@ public class ImppEnumUtil {
     /**
      * 短信供应商
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SMS_SUPPLIER {
 
         ALI_CLOUD(1, "阿里云");
@@ -1523,10 +1524,11 @@ public class ImppEnumUtil {
     /**
      * 短信模板状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SMS_TEMPLATE_STATUS {
-        VER_CODE(10, "审核中"),
-        NOTICE_SMS(20, "审核通过"),
-        PROMOTE_SMS(30, "审核失败");
+        UNDER_REVIEW(10, "审核中"),
+        PASS(20, "审核通过"),
+        FAIL(30, "审核失败");
 
         private int value;
         private String description;
@@ -1561,6 +1563,7 @@ public class ImppEnumUtil {
     /**
      * 短信模板类型
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SMS_TEMPLATE_TYPE {
         VER_CODE(10, "验证码"),
         NOTICE_SMS(20, "短信通知"),
@@ -1600,6 +1603,7 @@ public class ImppEnumUtil {
     /**
      * 短信发送状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SMS_SEND_STATUS {
         WAIT_RECEIPT(10, "等待回执"),
         FAIL(20, "发送失败"),
@@ -1634,4 +1638,36 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AUTH_LOGIN_STRATEGY {
+        ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"),
+        E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略");
+
+        private final int value;
+        private final String code;
+        private final String strategyName;
+        private final String description;
+
+        AUTH_LOGIN_STRATEGY(int value, String code, String strategyName, String description) {
+            this.value = value;
+            this.code = code;
+            this.strategyName = strategyName;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String codeOfStrategyName(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].strategyName;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2056,7 +2056,7 @@ public class MesEnumUtil {
         MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"),
         MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"),
         MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
-        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
+        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"),
         MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
         MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
         MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"),
@@ -4001,16 +4001,30 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_BUSI_TYPE {
+        GUIDE("guide", "引导信息"),
         MESSAGE("message", "返回信息"),
         STEP_LIST("stepList", "工步列表"),
+        STATE_LIST("stateList", "状态列表"),
         STEP_CONTENT("stepContent", "工步内容"),
-        MODULE_CONTENT("moduleContent", "组件内容"),
+        MODULE_CONTENT("moduleContent", "展示组件内容"),
+        MODULE_HEAD("moduleHead", "展示组件头"),
+        GUIDE_CONTENT("guideContent", "指导内容"),
+        ASSISTANT_CONTENT("assistantContent", "辅助展示组件"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
         RUNNING_INFO("runningInfo", "执行信息"),
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
-        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
+        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
+        PROCESS_CONTENT("processContent", "过程组件内容"),
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
+        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
+        TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
+        ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
+        TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"),
+        MESSAGE_POOL("messagePool", "消息池"),
+        FORCE_LOGOUT("forceLogout", "websocket强制下线");
 
 
         private String value;
@@ -4467,7 +4481,8 @@ public class MesEnumUtil {
     public enum ROUTE_TYPE {
 
         SCAN(10, "扫描流程"),
-        MONITOR(20, "监控流程");
+        MONITOR(20, "监控流程"),
+        MACHINE(30, "状态机流程");
 
         private int value;
         private String description;
@@ -4494,7 +4509,88 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FSM_EVENT {
+        TRIGGER(10, "trigger", "触发"),
+        ENTRY(20, "entry", "进入"),
+        EXIT(30, "exit", "离开");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private FSM_EVENT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static FSM_EVENT getByValue(int value) {
+            for (FSM_EVENT fsmEvent : values()) {
+                if (fsmEvent.getValue() == value) {
+                    return fsmEvent;
+                }
+            }
+            return null;
+        }
 
+        public static String valueOfDescription(int 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)
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态"),
+        BACK(99, "BACK", "回退状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATUS_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;
+        }
     }
 
     /**
@@ -6524,41 +6620,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum YELLOW_GUN_RULE {
-        COLLECT_TORQUE(10, "继续采集扭矩"),
-        SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
-
-        private int value;
-        private String description;
-
-        YELLOW_GUN_RULE(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)
@@ -7392,14 +7453,14 @@ public class MesEnumUtil {
      * 触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STEP_TRIGGER_TYPE {
+    public enum TRIGGER_TYPE {
         INTERNAL_TRIGGER(10, "内部触发"),
         EXTERNAL_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        STEP_TRIGGER_TYPE(int value, String description) {
+        TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -8243,4 +8304,83 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DELIVER_ORDER_MOVE_TYPE {
+        SHIPING(10, "发运"),
+        ALLOCATION(20, "发运&调拨");
+
+        private int value;
+        private String description;
+
+        DELIVER_ORDER_MOVE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_PATTERN_PARAMS {
+
+        MATCH_WORK_ORDER(10, "匹配工单"),
+        API_WORK_ORDER(20, "读取接口工单"),
+        SN_WORK_ORDER(30, "获取条码对应工单");
+
+        private int value;
+        private String description;
+
+        PRODUCT_PATTERN_PARAMS(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/MesPcnEnumUtil.java

@@ -1460,7 +1460,8 @@ public class MesPcnEnumUtil {
     public enum WC_CHECK_TYPE {
         MATERIAL(10, "MATERIAL", "物料"),
         ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
-        WORK_ORDER(30, "WORK_ORDER", "工单信息");
+        WORK_ORDER(30, "WORK_ORDER", "工单信息"),
+        CLOSE(40, "CLOSE", "关闭开线检查");
 
         private int value;
         private String code;
@@ -1952,6 +1953,43 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 工单启动池状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_START_CACHE_STATUS {
+
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private int value;
+        private String description;
+
+        WORK_START_CACHE_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;
+        }
+
+    }
+
+    /**
      * MesPlanOrder实体对应的planType值  计划类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2342,13 +2380,59 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 工步参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP_PARAM_TYPE {
+
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮"),
+        WINDOW(50, "window", "开窗");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STEP_PARAM_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;
+        }
+    }
+
+    /**
      * MesRoute 流程的类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ROUTE_TYPE {
 
         SCAN(10, "扫描流程"),
-        MONITOR(20, "监控流程");
+        MONITOR(20, "监控流程"),
+        MACHINE(30, "状态机流程");
 
         private int value;
         private String description;
@@ -2662,6 +2746,7 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_BUSI_TYPE {
+        GUIDE("guide", "引导信息"),
         MESSAGE("message", "返回信息"),
         STEP_LIST("stepList", "工步列表"),
         STATE_LIST("stateList", "状态列表"),
@@ -3536,8 +3621,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_EVENT {
         TRIGGER(10, "trigger", "触发"),
-        ENTRY(20, "entry", "进入状态"),
-        EXIT(30, "exit", "离开状态");
+        ENTRY(20, "entry", "进入"),
+        EXIT(30, "exit", "离开");
 
         private int value;
         private String code;
@@ -3560,57 +3645,103 @@ public class MesPcnEnumUtil {
         public String getDescription() {
             return this.description;
         }
+
+        public static FSM_EVENT getByValue(int value) {
+            for (FSM_EVENT fsmEvent : values()) {
+                if (fsmEvent.getValue() == value) {
+                    return fsmEvent;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int 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)
-    public enum FSM_STATE_TYPE {
-        BEGIN(10, "begin", "开始状态点"),
-        BACK(20, "back", "回退状态点"),
-        END(40, "end", "结束状态点");
+    public enum TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
 
         private int value;
-        private String code;
         private String description;
 
-        private FSM_STATE_TYPE(int value, String code, String description) {
+        TRIGGER_TYPE(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
         public int getValue() {
-            return this.value;
-        }
-
-        public String getCode() {
-            return this.code;
+            return value;
         }
 
         public String getDescription() {
-            return this.description;
+            return description;
         }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
-        INNER_TRIGGER(10, "内部触发"),
-        OUTER_TRIGGER(20, "外部触发");
+    public enum ACTOR_RECEIVE_STRATEGY {
+        WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"),
+        WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"),
+        WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"),
+        WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"),
+        WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件");
 
         private int value;
+        private String code;
+        private String clazz;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ACTOR_RECEIVE_STRATEGY(int value, String code, String clazz, String description) {
             this.value = value;
+            this.code = code;
+            this.clazz = clazz;
             this.description = description;
         }
 
+        public static ACTOR_RECEIVE_STRATEGY getByCode(String code) {
+            for (ACTOR_RECEIVE_STRATEGY strategy : values()) {
+                if (strategy.getCode().equals(code)) {
+                    return strategy;
+                }
+            }
+            return null;
+        }
+
         public int getValue() {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
+        public String getClazz() {
+            return clazz;
+        }
+
         public String getDescription() {
             return description;
         }
+
+        public static String codeOfClazz(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].clazz;
+                }
+            }
+            return tmp;
+        }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -3761,7 +3892,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOAD_FSM_ROUTE_TYPE {
 
-        BY_PART("0", "通过物料号加载"),
+        BY_PART("0", "外部加载"),
         BY_AUTO("1", "自动加载");
 
         private String value;
@@ -3792,7 +3923,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 组件状态类型
+     * 状态机状态点类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {
@@ -4165,7 +4296,8 @@ public class MesPcnEnumUtil {
         PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
         CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
         OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
-        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"),
+        NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码");
 
         private int value;
         private String code;
@@ -6097,4 +6229,399 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 扭矩枪版本
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TORQUE_VERSION {
+        PF6_2_0("PF6-2.0", "002000010030    00  \0", "PF6 2.0"),
+        PF6_3_0("PF6-3.0", "002000010060    00  \0", "PF6 3.0");
+
+        private String value;
+        private String code;
+        private String description;
+
+        TORQUE_VERSION(String code, String value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 TORQUE_VERSION getByCode(String code) {
+            for (TORQUE_VERSION torqueVersion : values()) {
+                if (torqueVersion.getCode().equals(code)) {
+                    return torqueVersion;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY {
+
+        FL("FL", "DOOR_FRONT_LEFT"),
+        FR("FR", "DOOR_FRONT_RIGHT"),
+        RL("RL", "DOOR_REAR_LEFT"),
+        RR("RR", "DOOR_REAR_RIGHT");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY(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 BOARD_TYPE {
+        BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
+        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_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"),
+        BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"),
+        BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板");
+
+        private String code;
+        private String description;
+
+        BOARD_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BOARD_TYPE getByCode(String code) {
+            for (BOARD_TYPE boardType : values()) {
+                if (boardType.getCode().equals(code)) {
+                    return boardType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 运算对象代码 Period capacity
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_OBJECT_CODE {
+        ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
+        ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
+        WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"),
+        PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能");
+
+        private String value;
+        private String description;
+
+        OPERATE_OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OPERATE_OBJECT_CODE getByValue(String value) {
+            for (OPERATE_OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HQL_EXPRESSION {
+        GT(">", ">", "大于"),
+        LT("<", "<", "小于"),
+        EQ("=", "=", "等于"),
+        NEQ("!=", "!=", "不等于"),
+        GTE(">=", ">=", "大于等于"),
+        LTE("<=", "<=", "小于等于"),
+        LIKE("like", "like", "LIKE"),
+        IN("in", "in", "包含");
+
+        private String value;
+        private String code;
+        private String description;
+
+        HQL_EXPRESSION(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
+
+        public static HQL_EXPRESSION codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOOLING_ACTION_RECORD_TYPE {
+        REPLACE(10, "REPLACE", "更换"),
+        WAREHOUSE(20, "WAREHOUSE", "入库"),
+        Use(30, "Use", "领用"),
+        ERROR(40, "ERROR", "异常操作");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TOOLING_ACTION_RECORD_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 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);
+        }
+    }
+
+    /**
+     * 看板-安灯监控状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_QUEUE_STATUS {
+        CALL(10, "呼叫"),
+        RESPONSE(20, "响应"),
+        SOLVE(30, "解决");
+
+        private int value;
+        private String description;
+
+        ANDON_QUEUE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            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 USER_LOGIN_STATUS {
+        ONLINE(10, "在线"),
+        OFFLINE(20, "离线");
+
+        private int value;
+        private String description;
+
+        USER_LOGIN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            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/PtlEnumUtil.java

@@ -816,4 +816,102 @@ public class PtlEnumUtil {
         }
     }
 
+    /**
+     * 完成器音乐枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINISH_TAG_LIGHT_MUSIC_CMD {
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 标签显示器亮灯颜色枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAG_LIGHT_COLOR_CMD {
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
 }

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

@@ -872,7 +872,8 @@ public class WmsEnumUtil {
         COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
         SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
         COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR
-        PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR
+        PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"),
+        SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR
 
         private int value;
         private String code;
@@ -2389,7 +2390,8 @@ public class WmsEnumUtil {
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
         INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
-        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
+        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号"),
+        PRINT_PACKAGE_NO_SERIAN("PRINT_PACKAGE_NO_SERIAN", "包装编号序列化");
 
         private String code;
         private String description;
@@ -2487,7 +2489,8 @@ public class WmsEnumUtil {
         TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
         BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"),
         BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"),
-        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象");
+        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"),
+        PDA_BTN(90, "PDA_BTN", "PDA按钮");
 
         private String code;
         private String description;
@@ -7989,7 +7992,8 @@ public class WmsEnumUtil {
     public enum BH_SUMMARY_IS_SYNC {
         INIT(10, "INIT", "初始化"),
         WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
-        FINISH_SYNC(30, "FINISH_SYNC", "已同步");
+        FINISH_SYNC(30, "FINISH_SYNC", "已同步"),
+        OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步");
 
         private int value;
         private String code;
@@ -9161,11 +9165,11 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_BOARD_STATUS {
-        FINISH(10, "已完成(绿色)"),
-        OVER_TIME(20, "已超时（红色）"),
-        UNRECEIVED(30, "未收货（蓝色）"),
-        VARIANT(40, "有差异（黄色）"),
-        NORMAL(50, "正常（白色）");
+        FINISH(10, "已完成"),//绿色
+        OVER_TIME(20, "已超时"),//红色
+        UNRECEIVED(30, "未收货"),//蓝色
+        VARIANT(40, "有差异"),//黄色
+        NORMAL(50, "正常");//白色
 
         private int value;
         private String description;
@@ -9538,6 +9542,98 @@ public class WmsEnumUtil {
 
         public static String valueOfDescription(int val) {
             return valueOf(val);
+
+        }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = ISOLATED_SCRAP.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PDA_BTN
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PDA_BTN {
+        CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PDA_BTN(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 valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * TIME_STATUS
+     */
+    public enum TIME_STATUS {
+        NORMAL(1,"正常"),
+        TIME_OUT(2,"超时");
+
+        private int value;
+        private String description;
+
+        TIME_STATUS(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 valueOfDescription(int val) {
+            return valueOf(val);
         }
     }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -159,10 +160,16 @@ public class BfElement extends BaseBean {
     @ApiParam(value ="默认排序规则")
     private Integer elementSortAttrType;
 
+    @Lob
     @Column(name="ELEMENT_CSS_STYLE")
     @ApiParam(value ="元素样式")
     private String elementCssStyle;
 
+    @Lob
+    @Column(name="ELEMENT_FORMATTER")
+    @ApiParam(value ="元素样式")
+    private String elementFormatter;
+
     @Column(name="ELEMENT_DESCRIPTION")
     @ApiParam(value ="元素描述")
     private String elementDescription;

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

@@ -172,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.createDatetime = createDatetime;

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

@@ -30,7 +30,7 @@ import java.io.Serializable;
 @Api("MES_看板图片")
 public class MesBoardImage extends BaseBean implements Serializable {
 
-    private static final long serialVersionUID = -3757764185082659130L;
+    private static final long serialVersionUID = -3511836584646450267L;
 
     @Column(name = "BOARD_CODE")
     @ApiParam("看板代码")

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

@@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_CFG_CODE")
     @ApiParam("客户配置代码")
     private String customerCfgCode;
+
+    @Column(name = "CUSTOMER_MARK")
+    @ApiParam("客户代号")
+    private String customerMark;
+
+    @Column(name = "CUSTOMER_LATCH")
+    @ApiParam("客户抬头")
+    private String customerLatch;
 }

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

@@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 import java.io.Serializable;
 
 /**
@@ -32,6 +28,10 @@ import java.io.Serializable;
 @Api("产品缺陷位置")
 public class MesDefectLocation extends BaseBean implements Serializable {
 
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型代码")
+    private String pptCode;
+
     @Column(name = "DEFECT_LOCATION")
     @ApiParam("缺陷位置代码")
     private String defectLocation;

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

@@ -119,6 +119,22 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品二维码")
     private String productSn;
 
+    @Transient
+    @ApiParam("措施代码")
+    private String repairCode;
+
+    @Transient
+    @ApiParam("措施描述")
+    private String repairName;
+
+    @Transient
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Transient
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
@@ -149,4 +165,33 @@ public class MesDefectRecord extends BaseBean implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public MesDefectRecord(Long id, String serialNumber, String workOrderNo, String partNo, String partName, String defectCode,
+                           String defectName, String defectLocation, String sideLocation, Integer repairStatus, String workCenterCode,
+                           String workCellCode, String memo, String defectActionType, Double qty, String repairCode, String repairName,
+                           String dcCode, String dcName, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.sideLocation = sideLocation;
+        this.repairStatus = repairStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo = memo;
+        this.defectActionType = defectActionType;
+        this.qty = qty;
+        this.repairCode = repairCode;
+        this.repairName = repairName;
+        this.dcCode = dcCode;
+        this.dcName = dcName;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -5,17 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
+import java.util.List;
 
 /**
  * @Description :设备周期作业计划
@@ -78,4 +74,8 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
     @ApiParam("作业任务编号")
     private String taskNo;
 
+    @Transient
+    @ApiParam("设备作业要求")
+    private List<MesEquTaskStandard> equTaskStandards;
+
 }

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

@@ -42,6 +42,10 @@ public class MesFurnaceLocation extends BaseBean implements Serializable {
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
 
+    @Column(name = "orientation")
+    @ApiParam("方向")
+    private String orientation;
+
     @Column(name = "SEQ")
     @ApiParam("推荐顺序")
     private Integer seq;

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

@@ -55,6 +55,10 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
     @ApiParam("末次时间")
     private String lastTime;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @ApiParam(value = "物料号")
     @Transient
     private String partNo;

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

@@ -54,13 +54,26 @@ public class MesNumberRule extends BaseBean implements Serializable {
 
     @Column(name = "SERIALNO_INCREMENT")
     @ApiParam("增量")
-    private Integer serialnoIncrement;
+    private Integer serialnoIncrement = 1;
+
+    @Column(name = "BEGIN_VAL")
+    @ApiParam("起始值")
+    private Integer beginVal = 1;
+
+    @Column(name = "END_VAL")
+    @ApiParam("最大值")
+    private Integer endVal;
 
     @Column(name = "IS_CYCLE")
     @ApiParam("最大值后循环")
     private Integer isCycle;
 
+    @Column(name = "IMPL_CLASS")
+    @ApiParam("最大值后不循环的实现类")
+    private String implClass;
+
     @Column(name = "SPILT_RULE")
-    @ApiParam("拼接规则")
+    @ApiParam("拼接固定字符,多个逗号分隔")
     private String spiltRule;
+
 }

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

@@ -239,7 +239,17 @@ public class MesPackage extends BaseBean implements Serializable {
         this.createDatetime = createDatetime;
     }
 
-    public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty = packSpecQty;
+        this.isSealed = isSealed;
+        this.ctNo = ctNo;
+    }
+
+    public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo,
                       String packageNo, String lotNo, String custCode, String shiftGroup) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -81,7 +81,7 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
+    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "varchar(225) default ''")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 
@@ -177,4 +177,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("客户零件号")
     private String custPartNo;
+
+    @Transient
+    @ApiParam("是否绑定关键件")
+    private Integer isBingKey;
 }

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

@@ -4,21 +4,17 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 import java.io.Serializable;
 
 /**
  * @Description:
- * @Author: jokelin
- * @Date: 2020/4/20 5:16 下午
+ * @Author: Jessica
+ * @Date: 2020/11/20 5:16 下午
  * @Modify:
  */
 @Data
@@ -41,6 +37,10 @@ public class MesPartFurnace extends BaseBean implements Serializable {
     @ApiParam("物料编码")
     private String partNo;
 
+    @Column(name = "orientation")
+    @ApiParam("方向")
+    private String orientation;
+
     @Column(name = "MODEL_IMG_URL")
     @ApiParam("模式图片路径")
     private String modelImgUrl;

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

@@ -71,4 +71,8 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable {
     @ApiParam(value ="模块" , access ="模块")
     private String moduleList;
 
+    @Column(name="STATUS")
+    @ApiParam(value ="状态" , access ="状态")
+    private Integer status;
+
 }

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

@@ -46,7 +46,7 @@ public class MesProdRouteCfg extends BaseBean implements Serializable {
     private String routeCode;
 
     @Column(name = "ROUTE_TYPE")
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型 30-状态机类型")
     private Integer routeType;
 
     @Column(name = "PPT_CODE")

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

@@ -86,7 +86,6 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("工步展示名称")
     private String stepDisplayName;
 
-    @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")
     private String paramAttribute;

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

@@ -131,7 +131,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -233,6 +232,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("颜色名称")
     private String colorName;
 
+    @Transient
+    @ApiParam("物料版本号")
+    private String versionNo;
+
     public MesProduceSn() {
     }
 
@@ -242,6 +245,48 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qty = qty;
     }
 
+    public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
+                        Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
+                        String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,
+                        String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType,
+                        String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo,
+                        String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.productSn = productSn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.qcStatus = qcStatus;
+        this.snStatus = snStatus;
+        this.printCount = printCount;
+        this.printStatus = printStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.nextProcessCode = nextProcessCode;
+        this.inWorkCenterTime = inWorkCenterTime;
+        this.outWorkCenterTime = outWorkCenterTime;
+        this.shippingTime = shippingTime;
+        this.workOrderNo = workOrderNo;
+        this.custSn = custSn;
+        this.custPartNo = custPartNo;
+        this.custCode = custCode;
+        this.snType = snType;
+        this.trayNo = trayNo;
+        this.operateType = operateType;
+        this.processLabelTemplate = processLabelTemplate;
+        this.prodLabelTemplate = prodLabelTemplate;
+        this.custLabelTemplate = custLabelTemplate;
+        this.lotNo = lotNo;
+        this.defectActionType = defectActionType;
+        this.vinCode = vinCode;
+        this.versionNo = versionNo;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -111,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Json4Es
     @Lob
     @Column(name = "LINE_DATA")

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

@@ -149,6 +149,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("序号")
+    private Integer seq;
+
     public MesQcCheckStandard() {
     }
 

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

@@ -122,6 +122,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @Transient
     @ApiParam("判定结果")
     private Integer checkResult = 0;

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

@@ -121,4 +121,8 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
 }

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

@@ -265,4 +265,21 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.assyNo = assyNo;
         this.queueType = queueType;
     }
+
+    public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber,
+                               String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus,
+                               String modifyUser) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.vinCode = vinCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.productSn = productSn;
+        this.serialNumber = serialNumber;
+        this.groupSeq = groupSeq;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.groupSide = groupSide;
+        this.jisBackflushStatus = jisBackflushStatus;
+        this.modifyUser = modifyUser;
+    }
 }

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

@@ -97,7 +97,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String spareMemo;
 
-    @Transient
+    @Column(name = "DEFECT_RECORD_ID")
     @ApiParam("不良记录id")
     private Long defectRecordId;
 

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

@@ -45,7 +45,7 @@ public class MesRoute extends BaseBean implements Serializable {
     private String position;
 
     @Column(name = "ROUTE_TYPE")
-    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型  30-状态机类型")
     private Integer routeType;
 
     @Transient

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

@@ -1,20 +1,14 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
 
 /**
@@ -37,10 +31,6 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态机代码")
     private String smCode;
 
-    @Column(name = "ROUTE_CODE")
-    @ApiParam("流程代码")
-    private String routeCode;
-
     @Column(name = "STATUS_CODE")
     @ApiParam("状态代码")
     private String statusCode;
@@ -53,6 +43,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态名称")
     private String statusName;
 
+    @Column(name = "NEXT_STATUS_NAME")
+    @ApiParam("下一状态名称")
+    private String nextStatusName;
+
     @Column(name = "TRIGGER_TYPE")
     @ApiParam("触发类型 10=内部触发 20=外部触发")
     private Integer triggerType;
@@ -78,7 +72,7 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     private Long outAmgId;
 
     @Column(name = "STATUS_TYPE")
-    @ApiParam("状态类型 10=初始化状态")
+    @ApiParam("状态类型 10=初始化状态 20=执行中状态 99=回退状态 40=结束状态")
     private Integer statusType;
 
     @Column(name = "SEQ")
@@ -90,6 +84,14 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     private Integer isInit = 1;
 
     @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Transient
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;
 
@@ -101,8 +103,37 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("前端显示颜色")
     private String color;
 
-//    @Transient
-//    @ApiParam("状态执行情况")
-//    private StepResult stepResult;
+    @Transient
+    @ApiParam("进入触发方法时默认校验外部触发")
+    private boolean isCheckOuterTrigger = true;
+
+    @Transient
+    @ApiParam("客制化下个状态点的触发事件")
+    private String nextTriggerEvent;
+
+
+    public MesStateMachineStatus() {
+    }
+
+    public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
+                                 String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq,
+                                 Integer isInit, String routeCode, String processCode) {
+        this.smCode = smCode;
+        this.statusCode = statusCode;
+        this.nextStatus = nextStatus;
+        this.statusName = statusName;
+        this.nextStatusName = nextStatusName;
+        this.triggerType = triggerType;
+        this.triggerEvent = triggerEvent;
+        this.triggerWhere = triggerWhere;
+        this.triggerAmgId = triggerAmgId;
+        this.inAmgId = inAmgId;
+        this.outAmgId = outAmgId;
+        this.statusType = statusType;
+        this.seq = seq;
+        this.isInit = isInit;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+    }
 
 }

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

@@ -36,7 +36,7 @@ public class MesStepGroup extends BaseBean implements Serializable {
     private Long amgId;
 
     @Column(name = "STEP_CODE")
-    @ApiParam("组件集代码")
+    @ApiParam("工步代码")
     private String stepCode;
 
     @Column(name = "SEQ")

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

@@ -81,10 +81,6 @@ public class MesStepParam extends BaseBean implements Serializable {
     private String objectWhere;
 
     @Transient
-    @ApiParam("可选值的数据")
-    private List<Map<String, Object>> enumList;
-
-    @Transient
     @ApiParam("key的值")
     private Object geValue;
 

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

@@ -86,6 +86,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("是否需要设备自动报警")
     private Integer isEquMonitor;
 
+    @Column(name = "IS_TEMPORARY")
+    @ApiParam("是否临时开线")
+    private Integer isTemporary = 2;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -207,6 +207,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Column(name = "SORT_SEQ")
+    @ApiParam("排序序号")
+    private String sortSeq;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -80,6 +80,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("工单状态")
     private Integer workOrderStatus;
 
+    @Column(name = "IS_PULL")
+    @ApiParam("是否投料")
+    private Integer isPull = 1;
+
     @Column(name = "WO_TYPE")
     @ApiParam("工单类型")
     private Integer workOrderType;
@@ -188,6 +192,14 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("父阶物料号")
     private String parentPartNo;
 
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name = "SORT_SEQ")
+    @ApiParam("排序序号")
+    private String sortSeq;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -70,7 +70,7 @@ public class BiModel implements Serializable {
     private double unQualifiedRate = 0;
 
     @ApiParam("目标合格率")
-    private double targetPassRate;
+    private double targetPassRate = 0;
 
     @ApiParam("颜色标识")
     private Integer colorFlag = 0;
@@ -93,6 +93,9 @@ public class BiModel implements Serializable {
     @ApiParam("末检")
     private Integer endCheck;//首件、30中件、40末件
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     private double qty;
 
     @ApiParam("比率")
@@ -116,4 +119,10 @@ public class BiModel implements Serializable {
         this.qty = qty;
         this.partNo = partNo;
     }
+
+    public BiModel(String workCellCode, String partNo, Integer qcStatus) {
+        this.workCellCode = workCellCode;
+        this.partNo = partNo;
+        this.qcStatus = qcStatus;
+    }
 }

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

@@ -100,6 +100,15 @@ public class GenSerialNoModel {
     @ApiParam("版本号")
     private String versionNo;
 
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @ApiParam("颜色名称")
+    private String colorName;
+
+    @ApiParam("拼接动态字符,多个逗号分隔")
+    private String dynamicRule;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -21,16 +21,16 @@ public class MaterialLotModel implements Serializable {
 
     private String modifyDateTime;
 
-    @ApiParam("生产日期")
+    @ApiParam("供应商批次")
     private String dateCode;
 
-    @ApiParam("批次")
+    @ApiParam("收货日期")
     private String lotNo;
 
     @ApiParam("特殊批次")
     private String fixLotNo;
 
-    @ApiParam("生产批次")
+    @ApiParam("生产日期")
     private String leftCode;
 
     @ApiParam("物料代码")

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -27,7 +26,7 @@ public class MesBoardWorkCenterOverviewModel {
     private String imageUrl;
 
     @ApiParam("工单列表")
-    List<MesWorkOrder> workOrderList;
+    List<ProductBiModel> workOrderList;
 
     @ApiParam("班组信息")
     MesShiftGroup shiftGroup;

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

@@ -130,4 +130,8 @@ public class MesControlPlanTemplateModel extends BaseBean {
     @AnnoOutputColumn
     private String checkCfgNo;
 
+    @ApiParam("序号")
+    @AnnoOutputColumn
+    private Integer seq;
+
 }

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class MesEquTaskPlanModel implements Serializable {
@@ -73,6 +73,9 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("设备周期计划配置")
     private MesEquTaskPlanCfg planCfg;
 
+    @ApiParam("设备作业要求")
+    private List<MesEquTaskPlanStandard> equTaskStandards;
+
     public MesEquTaskPlanModel() {
 
     }

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

@@ -20,21 +20,40 @@ public class MesPackageQueryModel extends MesPackage {
     @ApiParam("工序名称")
     private String processName;
 
+    @ApiParam("工位")
+    private String workCellName;
+
     @ApiParam("产线")
     private String workCenterName;
 
-    @ApiParam("工作单元名称")
-    private String workCellName;
+    @ApiParam("是否封箱Name")
+    private String isSealedName;
 
     public MesPackageQueryModel(String workCenterName, String workCellName) {
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
     }
 
-    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo);
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.workCenterName = workCenterName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo, String processName, String workCenterName, String workCellName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) {
         super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.isSealedName=isSealedName;
         this.processName=processName;
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
     }
+
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -29,6 +30,9 @@ public class MesPaintSnPrintModel implements Serializable {
     @ApiParam("包装编号")
     private String packageNo;
 
+    @ApiParam("包装信息")
+    private MesPackage packageInfo;
+
     @ApiParam("工单号")
     private String workOrderNo;
 

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

@@ -80,4 +80,7 @@ public class MesQualityStandardModel {
 
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
+
+    @ApiParam("序号")
+    private Integer seq;
 }

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

@@ -12,4 +12,10 @@ public class MesWorkCellStatusModel {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("故障类型")
+    private String alarmName;
+
+    @ApiParam("故障原因")
+    private String acDesc;
+
 }

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

@@ -118,6 +118,7 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("箱条码")
     private String packageNo;
+    public String createDatetime;
 
     public QueueOrderModel() {
     }
@@ -214,7 +215,8 @@ public class QueueOrderModel implements Serializable {
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
                            String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq,
-                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) {
+                           String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType,
+                           String createDatetime) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -233,6 +235,7 @@ public class QueueOrderModel implements Serializable {
         this.custProdLineCode = custProdLineCode;
         this.specialFlag = specialFlag;
         this.workType = workType;
+        this.createDatetime = createDatetime;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 /**
@@ -8,14 +9,17 @@ import lombok.Data;
  * @desc
  */
 @Data
-@Deprecated
 public class StateModel {
 
+    @ApiParam("状态点代码")
     private String stateCode;
 
+    @ApiParam("状态点名称")
     private String stateName;
 
-    private String routeCode;
+    @ApiParam("顺序")
+    private Integer seq;
 
-    private String smCode;
+    @ApiParam("颜色")
+    private String color;
 }

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

@@ -25,6 +25,15 @@ public class StationRequestBean implements Serializable {
 
     private static final long serialVersionUID = -8597212451891803174L;
 
+    @ApiParam("新旧流程标识 默认新流程")
+    private boolean isOldRoute = false;
+
+    @ApiParam("ACTOR接收策略类名")
+    private String actorReceiveStrategyClass;
+
+    @ApiParam("工步列表")
+    private List<StateModel> stateList;
+
     @ApiParam("扫描信息")
     private String scanInfo;
 
@@ -190,7 +199,7 @@ public class StationRequestBean implements Serializable {
     @ApiParam("创建时间")
     private String createDatetime;
 
-    @ApiParam("创建时间")
+    @ApiParam("包装编号")
     private String packageNo;
 
     @ApiParam("密码")
@@ -232,6 +241,8 @@ public class StationRequestBean implements Serializable {
                 ", workOrderNo='" + workOrderNo + '\'' +
                 ", tray='" + tray + '\'' +
                 ", finishCount=" + finishCount +
+                ", packageNo=" + packageNo +
+                ", createDatetime=" + createDatetime +
                 '}';
     }
 }

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

@@ -138,5 +138,13 @@ public class StepPrintSnModel extends MesProduceSn {
     private String jitSeq;
     @ApiParam("产品位置名称")
     private String produceCategoryName;
-
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @ApiParam("版本号")
+    private String versionNo;
+    @ApiParam("泰国WL物料描述")
+    private String tgPartDesc;
+    @ApiParam("泰国过程条码截取前11位")
+    private String snTop11;
 }

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

@@ -25,6 +25,8 @@ public class StepResult<T> {
 
     private MesPcnEnumUtil.STEP_RESULT_CMD cmd;
 
+    private String nextTriggerEvent;
+
     public static StepResult getNonComplete() {
         return new StepResult(false, "");
     }

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

@@ -87,9 +87,22 @@ public class TJMgnBoardModel extends BaseBean implements Serializable {
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("创建时间")
+    private String createDatetime;
+
     public TJMgnBoardModel() {
     }
 
+    public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty, String createDatetime) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.workOrderNo = workOrderNo;
+        this.snQty = snQty;
+        this.createDatetime = createDatetime;
+    }
+
     public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -13,17 +13,22 @@ import java.io.Serializable;
  * @date 2020/12/18 15:16
  **/
 @Data
-@ApiModel("产品履历报表-缺陷信息")
+@ApiModel("产品工序过程查询-缺陷信息")
 public class DefectRecordModel implements Serializable {
 
     private static final long serialVersionUID = 4994719388513997046L;
 
+    @ApiParam("产线")
+    private String workCenterName;
 
-    @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    @ApiParam("工序名称")
+    private String processName;
 
-    @ApiParam("不良处理类型名称")
-    private String defectActionTypeName;
+    @ApiParam("质量代码")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态")
+    private String qcStatusName;
 
     @ApiParam("缺陷名称")
     private String defectName;
@@ -34,10 +39,28 @@ public class DefectRecordModel implements Serializable {
     @ApiParam("缺陷位置名称")
     private String defectLocationName;
 
-    @ApiParam(value = "创建用户")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("零件二维码")
+    private String serialNumber;
+
+    @ApiParam(value = "执行人")
     public String createUser;
 
-    @ApiParam(value = "创建日期")
+    @ApiParam(value = "扫描时间")
     public String createDatetime;
 
+
+    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.qcStatus = qcStatus;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.customerPartNo = customerPartNo;
+        this.serialNumber = serialNumber;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -20,57 +20,65 @@ public class PackageTravelModel implements Serializable {
 
     private static final long serialVersionUID = -7031472442162953544L;
 
+    @ApiParam("客户零件号")
+    private String packageNo;
 
-    @ApiParam("过程条码")
-    private String serialNumber;
+    @ApiParam("客户零件号")
+    private String customerPartNo;
 
-    @ApiParam("料箱编号")
-    private String ctNo;
+    @ApiParam("零件二维码")
+    private String serialNumber;
 
-    @ApiParam("包装号")
-    private String packageNo;
+    @ApiParam("CMS零件号")
+    private String partNo;
 
-    @ApiParam("料箱类型")
-    private String cnCode;
+    @ApiParam("CMS标签号")
+    private String qrCode;
 
-    @ApiParam("料箱状态")
-    private String useStatus;
+    @ApiParam("产线")
+    private String workCenterName;
 
-    @ApiParam("料箱状态名称")
-    private String useStatusName;
+    @ApiParam("工序名称")
+    private String processName;
 
-    @ApiParam("物料码")
-    private String partNo;
+    @ApiParam("料架类型")
+    private String ctCode;
 
-    @ApiParam("物料名称")
-    private String partNameRdd;
+    @ApiParam("料架编号")
+    private String ctNo;
 
-    @ApiParam("产线")
-    private String workCenterCode;
+    @ApiParam("进炉模式")
+    private String modelNo;
 
-    @ApiParam("工序信息")
-    private String processCode;
+    @ApiParam("炉内料架位置")
+    private String fnLocationNo;
 
-    @ApiParam("执行动作")
-    private Integer opType;
+    @ApiParam("层位置")
+    private String ctLocationNo;
 
-    @ApiParam("执行动作名称")
-    private String opTypeName;
+    @ApiParam("层内零件位置")
+    private String ctLocationPartNo;
 
     @ApiParam("执行时间")
     private String createDatetime;
 
-    public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
-        this.serialNumber = serialNumber;
-        this.ctNo = ctNo;
+    @ApiParam("执行时间")
+    private String createUser;
+
+    public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
         this.packageNo = packageNo;
-        this.cnCode = cnCode;
-        this.useStatus = useStatus;
+        this.customerPartNo = customerPartNo;
+        this.serialNumber = serialNumber;
         this.partNo = partNo;
-        this.partNameRdd = partNameRdd;
-        this.workCenterCode = workCenterCode;
-        this.processCode = processCode;
-        this.opType = opType;
+        this.qrCode = qrCode;
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.ctCode = ctCode;
+        this.ctNo = ctNo;
+        this.modelNo = modelNo;
+        this.fnLocationNo = fnLocationNo;
+        this.ctLocationNo = ctLocationNo;
         this.createDatetime = createDatetime;
+        this.createUser = createUser;
     }
 }

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

@@ -33,11 +33,15 @@ public class ProcessScrapRate {
     @ApiParam("报废率")
     private BigDecimal scrapRate;
 
+    @ApiParam("物料号")
+    private String partNo;
 
-    public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode) {
+
+    public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode,String partNo) {
         this.processCode = processCode;
         this.processName = processName;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.workCellCode = workCellCode;
+        this.partNo = partNo;
     }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model.report;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -11,13 +12,13 @@ import java.util.List;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/28 14:18 下午
- * @Description: 一次性通过率占比柏拉图报表查询参数model
+ * @Description: 缺陷率占比柏拉图报表查询参数model
  **/
-@Api("一次性通过率占比柏拉图报表查询参数model")
+@Api("缺陷率占比柏拉图报表查询参数model")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoQueryModel {
+public class ProduceDefectRatePlatoQueryModel extends BaseBean {
     /**
      * 必选
      */
@@ -25,8 +26,12 @@ public class ProduceDispPassPlatoQueryModel {
     @ApiParam("工序")
     private String processCode;
 
-    @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    @ApiParam("柱子展示条数")
+    private Integer displaySize;
+
+    //质量状态（20冻结，30报废）
+    @ApiParam("质量状态")
+    private List<Integer> qcStatusList;
     /**
      * 可选
      */
@@ -36,6 +41,10 @@ public class ProduceDispPassPlatoQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
+    //统计方式（0按月，1按天。）
+    @ApiParam("统计方式")
+    private Integer statisticalMethod;
+
     @ApiParam("开始时间")
     private String modifyStartDate;
 

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

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model.report;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Author: xiangming.liao
- * @CreateDate: 2020/12/28 14:24 下午
- * @Description: 一次性通过率占比柏拉图报表model
- **/
-@Api("一次性通过率占比柏拉图报表model")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProduceDispPassPlatoModel {
-
-    @ApiParam("项目号")
-    private List<String> prodCfgTypeCodeList;
-
-    @ApiParam("零件号")
-    private List<String> partNoList;
-
-    @ApiParam("单项占比")
-    private BigDecimal singleRatio;
-
-    @ApiParam("累计占比")
-    private BigDecimal cumulativeRatio;
-
-    @ApiParam("缺陷数量")
-    private BigDecimal defectQty;
-
-}

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

@@ -19,11 +19,9 @@ public class ProduceDispPassRateModel {
     @ApiParam("统计时间")
     private String statisticalTime;
 
-    @ApiParam("质量状态/类型")
-    private Integer qcStatus;
-
+    //统计选项（10=全部，20=冻结，30=报废）
     @ApiParam("统计选项")
-    private String statisticalOption;
+    private Integer statisticalOption;
 
     @ApiParam("冻结数")
     private BigDecimal freezeQty;
@@ -37,9 +35,8 @@ public class ProduceDispPassRateModel {
     @ApiParam("占比率")
     private BigDecimal ratio;
 
-    public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+    public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
         this.statisticalTime = statisticalTime;
-        this.qcStatus = qcStatus;
         this.statisticalOption = statisticalOption;
         this.freezeQty = freezeQty;
         this.scrapQty = scrapQty;

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

@@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("工序")
     private String processCode;
 
+    //统计方式（0=按月，1按天）
     @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    private Integer statisticalMethod;
 
+    //质量状态（10=合格，20=冻结，30=报废）
     @ApiParam("质量类型")
-    private String qcStatus;
+    private Integer qcStatus;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
 
     /**
      * 可选
@@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    @ApiParam("开始时间")
-    private String modifyStartDate;
-
-    @ApiParam("结束时间")
-    private String modifyEndDate;
 
 }

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

@@ -21,6 +21,9 @@ public class ProductDetailResult {
     @ApiParam("零件号")
     private String partNo;
 
+    @ApiParam
+    private String customerPartNo;
+
     @ApiParam("零件描述")
     private String partNameRdd;
 
@@ -48,10 +51,14 @@ public class ProductDetailResult {
     @ApiParam(value = "修改日期")
     public String modifyDatetime;
 
+    @ApiParam(value = "生产线名称")
+    public String workCenterName;
+
 
-    public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime,String workCenterName) {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;
@@ -61,5 +68,6 @@ public class ProductDetailResult {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -19,6 +19,8 @@ public class ProductResult {
     private String workCellCode;
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("零件号")
+    private String customerPartNo;
     @ApiParam("零件描述")
     private String partNameRdd;
     @ApiParam("生产线")
@@ -41,10 +43,13 @@ public class ProductResult {
     private BigDecimal unqualifiedRate;
     @ApiParam("报废率")
     private BigDecimal scrapRate;
+    @ApiParam("生产线名称")
+    private String workCenterName;
 
-    public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap,String workCenterName) {
         this.workCellCode = workCellCode;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;
@@ -52,5 +57,6 @@ public class ProductResult {
         this.qualified = qualified;
         this.unqualified = unqualified;
         this.scrap = scrap;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -16,47 +16,53 @@ import java.io.Serializable;
 @ApiModel("产品履历报表-产品信息")
 public class ProductSnModel implements Serializable {
 
-    private static final long serialVersionUID = 5217363746963291483L;
+    private static final long serialVersionUID = 7137684552464509466L;
 
 
-    @ApiParam("过程条码")
-    private String serialNumber;
-
-    @ApiParam("条码状态")
-    private Integer snStatus;
-
-    @ApiParam("条码状态Name")
-    private String snStatusName;
-
-    @ApiParam("质量状态")
-    private Integer qcStatus;
+    @ApiParam("客户零件号")
+    private String customerPartNo;
 
-    @ApiParam("质量状态Name")
-    private String qcStatusName;
+    @ApiParam("零件二维码")
+    private String serialNumber;
 
-    @ApiParam("物料码")
+    @ApiParam("CMS零件号")
     private String partNo;
 
-    @ApiParam("物料名称")
-    private String partNameRdd;
+    @ApiParam("CMS标签号")
+    private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
+
+    @ApiParam("工序名称")
+    private String processName;
 
-    @ApiParam("流程代码")
-    private String routeCode;
+    @ApiParam("工位名称")
+    private String workCellName;
 
-    @ApiParam("当前工序")
-    private String processCode;
+    @ApiParam(value = "扫码时间")
+    public String createDatetime;
 
-    @ApiParam("条码类型")
-    private Integer snType;
+    @ApiParam(value = "执行人")
+    public String createUser;
 
-    @ApiParam("条码类型Name")
-    private String snTypeName;
+    @ApiParam("质量代码")
+    private Integer qcStatus;
 
+    @ApiParam("质量状态")
+    private String qcStatusName;
 
-    @ApiParam(value = "执行时间")
-    public String modifyDatetime;
 
+    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
+        this.customerPartNo = customerPartNo;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.qrCode = qrCode;
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.qcStatus = qcStatus;
+    }
 }

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model.report;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 生产统计
  * @author yumingxing
@@ -13,6 +15,12 @@ import lombok.Data;
 public class ProductStatisticsQueryModel {
 
     @ApiParam("生产线")
+    private List<String> workCenterCodeList;
+    @ApiParam("工序")
+    private List<String> processCodeList;
+    @ApiParam("零件号")
+    private List<String> partNoList;
+    @ApiParam("生产线")
     private String workCenterCode;
     @ApiParam("工序")
     private String processCode;

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

@@ -20,9 +20,6 @@ public class ReportQueryModel {
     @ApiParam("项目号")
     private List<String> prodCfgTypeCodeList;
 
-    /**
-     * 零件号取物料号
-     */
     @ApiParam("零件号")
     private List<String> partNoList;
 
@@ -38,4 +35,7 @@ public class ReportQueryModel {
     @ApiParam("姓名")
     private String userName;
 
+    @ApiParam("单个工序")
+    private String singleProcessCode;
+
 }

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

@@ -22,6 +22,8 @@ public class ScrapOfPlatoModel {
 
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("客户零件号")
+    private String customerPartNo;
     @ApiParam("项目")
     private String prodCfgTypeCode;
     @ApiParam("缺陷代码")
@@ -41,12 +43,12 @@ public class ScrapOfPlatoModel {
     private BigDecimal scrapRatioPlato;
 
 
-    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
+    public ScrapOfPlatoModel(String partNo, String customerPartNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.defectCode = defectCode;
         this.defectName = defectName;
         this.numberOfDefects = numberOfDefects;
-        this.workCellCode = workCellCode;
     }
 }

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

@@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
@@ -91,19 +90,19 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) {
+        if (!StringUtils.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesPlanOrder.getStartTimeStart(),
                     mesPlanOrder.getStartTimeEnd(),
                     "startTime", packBean, true);
         }
-        if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) {
+        if (!StringUtils.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getEndTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesPlanOrder.getEndTimeStart(),
                     mesPlanOrder.getEndTimeEnd(),
                     "endTime", packBean, true);
         }
-        if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesPlanOrder.getCreateDateTimeStart(),
                     mesPlanOrder.getCreateDateTimeEnd(),
@@ -190,19 +189,19 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesWorkOrder.getStartTimeStart(),
                     mesWorkOrder.getStartTimeEnd(),
                     "startTime", packBean, true);
         }
-        if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesWorkOrder.getEndTimeStart(),
                     mesWorkOrder.getEndTimeEnd(),
                     "endTime", packBean, true);
         }
-        if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesWorkOrder.getCreateDateTimeStart(),
                     mesWorkOrder.getCreateDateTimeEnd(),
@@ -253,7 +252,7 @@ public class MesHqlPack {
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
-        if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesQueueOrder.getCreateDateTimeStart(),
                     mesQueueOrder.getCreateDateTimeEnd(),
@@ -347,23 +346,42 @@ public class MesHqlPack {
      */
     public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
-        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
+        if (!StringUtils.isEmpty(mesRoute.getRouteCode())) {
+            DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesRoute.getRouteName())) {
+            DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesRoute.getRouteType())) {
+            DdlPreparedPack.getNumEqualPack(mesRoute.getRouteType(), "routeType", packBean);
+        }
         return packBean;
     }
 
     /**
      * 产品流程配置查询条件封装
      *
-     * @param mesProdRouteCfg
+     * @param prodRouteCfg
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
-        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
+    public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg prodRouteCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodRouteCfg, organizeCode);
+        if (!StringUtils.isEmpty(prodRouteCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(prodRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(prodRouteCfg.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodRouteCfg.getPptCode())) {
+            DdlPreparedPack.getStringEqualPack(prodRouteCfg.getPptCode(), "pptCode", packBean);
+        }
+        if (!StringUtils.isEmpty(prodRouteCfg.getRouteCode())) {
+            DdlPreparedPack.getStringEqualPack(prodRouteCfg.getRouteCode(), "routeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(prodRouteCfg.getRouteType())) {
+            DdlPreparedPack.getNumEqualPack(prodRouteCfg.getRouteType(), "routeType", packBean);
+        }
         return packBean;
     }
 
@@ -2104,10 +2122,10 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) {
             DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
 //            DdlPreparedPack.timeBuilder(
 //                    mesProduceSn.getOutWorkCenterStartTime(),
@@ -2220,9 +2238,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
             DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
-            DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
-        }
         if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
             DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }
@@ -2305,10 +2320,10 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
             DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
         }
-        if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) {
@@ -2499,13 +2514,13 @@ public class MesHqlPack {
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);
         }
-        if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) {
+        if (!StringUtils.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitActual.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     queueJitActual.getCreateDateTimeStart(),
                     queueJitActual.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
-        if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) {
+        if (!StringUtils.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtils.isEmpty(queueJitActual.getCustPointEndDate())) {
             DdlPreparedPack.timeBuilder(
                     queueJitActual.getCustPointStartDate(),
                     queueJitActual.getCustPointEndDate(),
@@ -2783,12 +2798,10 @@ public class MesHqlPack {
      * MES 工位技能
      *
      * @param mesWorkCellSkill
-     * @param organizeCode
      * @return
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
-        ;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3596,9 +3609,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
-            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
-        }
         if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
         }
@@ -3614,23 +3624,32 @@ public class MesHqlPack {
     /**
      * MES客户条码规则查询条件封装
      *
-     * @param mesCustomerSnRule
-     * @return
+     * @param customerSnRule 客户条码规则查询条件
+     * @return 查询数据
      */
-    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
+    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule customerSnRule) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customerSnRule, customerSnRule.getOrganizeCode());
+        if (!StringUtils.isEmpty(customerSnRule.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerCode(), "customerCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
+        if (!StringUtils.isEmpty(customerSnRule.getCustomerPartNo())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
+        if (!StringUtils.isEmpty(customerSnRule.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(customerSnRule.getLength())) {
+            DdlPreparedPack.getNumEqualPack(customerSnRule.getLength(), "length", packBean);
         }
         return packBean;
     }
 
+    /**
+     * MES物料上炉模式查询条件封装
+     *
+     * @param partFurnace 物料上炉模式查询条件
+     * @return 查询数据
+     */
     public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) {
         DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode());
         DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean);
@@ -3711,4 +3730,62 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesQueueOrderDetail(MesQueueOrderDetail queueOrderDetail) {
+        DdlPackBean packBean = getAllBaseData(queueOrderDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getSerialNumber(), "serialNumber", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNameRdd(), "partNameRdd", packBean);
+        return packBean;
+    }
+
+    /**
+     * MES_状态机信息查询条件封装
+     *
+     * @param stateMachine
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlMesStateMachine(MesStateMachine stateMachine, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(stateMachine, organizeCode);
+        if (!StringUtils.isEmpty(stateMachine.getSmCode())) {
+            DdlPreparedPack.getStringLikerPack(stateMachine.getSmCode(), "smCode", packBean);
+        }
+        if (!StringUtils.isEmpty(stateMachine.getSmName())) {
+            DdlPreparedPack.getStringLikerPack(stateMachine.getSmName(), "smName", packBean);
+        }
+        if (!StringUtils.isEmpty(stateMachine.getSmType())) {
+            DdlPreparedPack.getNumEqualPack(stateMachine.getSmType(), "smType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 数据迁移表查询条件封装
+     * @param cfg
+     * @return
+     */
+    public static DdlPackBean getDataMigrationCfg(MesDataMigrationCfg cfg) {
+        DdlPackBean packBean = getAllBaseData(cfg.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(cfg.getIsValid(), "isValid", packBean);
+        if (!StringUtils.isEmpty(cfg.getPcnCode())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getPcnCode(), "pcnCode", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getMigName())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getMigName(), "migName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getRemark())) {
+            DdlPreparedPack.getStringLikerPack(cfg.getRemark(), "remark", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcTableName(), "srcTableName", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getSrcQueryConditions())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getSrcQueryConditions(), "srcQueryConditions", packBean);
+        }
+        if (!StringUtils.isEmpty(cfg.getDestTableName())) {
+            DdlPreparedPack.getStringEqualPack(cfg.getDestTableName(), "destTableName", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -125,6 +125,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否允许重置")
     private Integer isResetAble;
 
+    @ApiParam(value = "是否重置")
+    private Integer isReset;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
@@ -155,4 +158,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
         this.codeStatus = codeStatus;
     }
 
+    public int getIsResetVal() {
+        return this.isReset == null ? 0 : this.isReset;
+    }
 }

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

@@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable {
     public List<WmsOptionModel> options;
     @ApiParam("作业流程明细Model集合")
     public Map<String, WmsAgdCacheModel> wmsAgdCacheModelMap;
+    @ApiParam("流程级别组件参数集合")
+    public Map<String,Map<String,String>> wmsAgAmParamsMap;
 }

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 北京麦格纳BBAC库存扣减MODEL
@@ -35,6 +34,9 @@ public class WmsBjmgnBbacReductModel implements Serializable {
     public Double qty;
     @ApiParam("单位")
     public String unit;
+    @ApiParam("包含0")
+    public Integer includeZero;
+
 
     public WmsBjmgnBbacReductModel() {
     }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,6 +48,10 @@ public class SysSmsSendRecord extends BaseBean {
     @ApiModelProperty(value = "软件模块")
     private Integer softType;
 
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
+
     /**
      * 接收手机号
      */
@@ -104,6 +109,10 @@ public class SysSmsSendRecord extends BaseBean {
     @ApiModelProperty(value = "短信发送状态")
     private Integer smsSendStatus;
 
+    public String getSmsSendStatusTxt() {
+        return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus);
+    }
+
     /**
      * 短信发送时间
      */

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java

@@ -51,12 +51,13 @@ public class SysSmsTemplate extends BaseBean {
      * 模板代码
      */
     @Column(name = "SUPPLIER_TEMPLATE_CODE")
-    @ApiModelProperty(value = "模板代码")
+    @ApiModelProperty(value = "供应商模板代码")
     private String supplierTemplateCode;
 
     /**
      * 模板类型
      */
+    @AnnoOutputColumn
     @Column(name = "TEMPLATE_TYPE")
     @ApiModelProperty(value = "模板类型")
     private Integer templateType;
@@ -64,10 +65,15 @@ public class SysSmsTemplate extends BaseBean {
     /**
      * 供应商类型
      */
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class)
     @Column(name = "SUPPLIER_TYPE")
     @ApiModelProperty(value = "供应商类型")
     private Integer supplierType;
 
+    public String getSupplierTypeTxt() {
+        return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType);
+    }
+
     /**
      * 模板状态
      */
@@ -76,6 +82,10 @@ public class SysSmsTemplate extends BaseBean {
     @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class)
     private Integer templateStatus;
 
+    public String getTemplateStatusTxt() {
+        return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus);
+    }
+
     /**
      * 模板内容
      */
@@ -92,6 +102,13 @@ public class SysSmsTemplate extends BaseBean {
 
 
     /**
+     * 是否修改模板内容
+     */
+    @Transient
+    @ApiModelProperty(value = "是否修改模板内容")
+    private Integer isModifyContent;
+
+    /**
      * 审批备注
      */
     @Transient

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -375,4 +375,47 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean);
         return packBean;
     }
+
+    /**
+     * 区段
+     * @param section
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlSection(PtlSection section, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(section, organizeCode);
+        DdlPreparedPack.getStringLikerPack(section.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionNo(), "sectionNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionName(), "sectionName", packBean);
+        return packBean;
+    }
+
+    /**
+     * 控制器
+     * @param control
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlControl(PtlControl control, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(control, organizeCode);
+        DdlPreparedPack.getStringLikerPack(control.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlNo(), "controlNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlName(), "controlName", packBean);
+        DdlPreparedPack.getNumEqualPack(control.getControlType(), "controlType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 物料
+     * @param part
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlPart(PtlPart part, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
+        DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(part.getPartType(), "partType", packBean);
+        return packBean;
+    }
 }

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

@@ -5,17 +5,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
-import javax.persistence.Version;
+import javax.persistence.*;
 
 /**
  * @Description :
@@ -167,4 +162,8 @@ public class SwebDocMovementDetails extends BaseBean {
     @Column(name = "LOT_NO")
     @ApiParam("批次")
     public String lotNo;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
 }

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

@@ -1,18 +1,15 @@
 package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 
 /**
  * @Description :
@@ -149,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean {
     @Column(name = "SHIP_TIME")
     @ApiParam(value = "发运时间")
     private String shipTime;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
 }

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

@@ -1,19 +1,16 @@
 package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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;
+import javax.persistence.*;
 
 /**
  * @Description :
@@ -81,4 +78,8 @@ public class SwebDocMovementSn extends BaseBean {
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")
     private String vendorName;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
 }

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

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 作业流程
@@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean {
     @Transient
     @ApiParam(value = "提交步骤序号")
     private Integer submitStepSeq;
+    @Transient
+    @ApiParam(value = "流程级别组件参数")
+    private List<WmsActionStepCallParam> agAmParamsList;
 
     public long getInitAmIdVal() {
         return this.initAmId == null ? 0 : this.initAmId.longValue();

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

@@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -13,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -118,4 +118,8 @@ public class WmsBomTotal extends BaseBean {
     @Transient
     @ApiParam(value = "状态")
     private Integer status;
+
+    @Transient
+    @ApiParam(value = "异常信息")
+    private String errorMsg;
 }

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

@@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "目的库位名称")
     public String destLocateName;
 
+    @Transient
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -535,7 +546,7 @@ public class WmsDocMovementDetails extends BaseBean {
         this.priority = priority;
         this.orderNo = orderNo;
     }
-public WmsDocMovementDetails (String partNo,String orderNo) {
+    public WmsDocMovementDetails (String partNo,String orderNo) {
         this.partNo = partNo;
         this.orderNo = orderNo;
     }
@@ -740,9 +751,9 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.destLocateName = locateName;
     }
 
-    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType,
-                                 String item, String partNo, String partNameRdd,String unit, Double qty,
-                                 Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
+    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
+                                 String item, String partNo, String partNameRdd, String unit, Double qty,
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo, String assignDateCode) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -757,5 +768,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.orderMasterStatus = orderMasterStatus;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.seqNo = seqNo;
+        this.assignDateCode = assignDateCode;
+    }
+
+    public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
     }
 }

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

@@ -34,25 +34,21 @@ import javax.persistence.Table;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "物流费用管理")
 public class WmsLogisticsCosts extends BaseBean {
-
     private static final long serialVersionUID = -5307311210847854654L;
-    @Column(name = "ORGANIZE_NAME")
-    @ApiParam(value = "工厂名称")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String organizeName;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
+    private Integer transportType;
 
     @Column(name = "PLACE_OF_ORIGIN")
-    @ApiParam(value = "发出地")
+    @ApiParam(value = "发出地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String placeOfOrigin;
 
-    @Column(name = "DESTINATION_WAREHOUSE")
-    @ApiParam(value = "目的仓库")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String destinationWarehouse;
-
     @Column(name = "SHIPPING_FLAG")
-    @ApiParam(value = "发往地")
+    @ApiParam(value = "发往地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
@@ -61,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String logisticsVendorNo;
 
+    @Column(name = "part_no")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "part_name")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
     @Column(name = "SALES_UNIT")
     @ApiParam(value = "计价单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String salesUnit;
 
-    @Column(name = "TRANSPORT_TYPE")
+    @Column(name = "TRANSPORT_MODE")
     @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
-    private Integer transportType;
+    private Integer transportMode;
 
     @Column(name = "price")
     @ApiParam(value = "单价")
@@ -83,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean {
     private String startDate;
 
     @Column(name = "END_DATE")
-    @ApiParam(value = "结束日期")
+    @ApiParam(value = "失效日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endDate;
 

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

@@ -42,4 +42,7 @@ public class WmsOperationBean<Obj> extends BaseBean {
 
     @ApiParam("选中的明细数据")
     public List<String> details;
+
+    @ApiParam("是否确认重置")
+    public int isConfirmReset;
 }

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

@@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -109,7 +109,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "ABC")
     @ApiParam(value = "分类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_ABC")
     private String abc;
 
     @Column(name = "BUY_UNIT")

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

@@ -397,6 +397,10 @@ public class WmsStockSn extends BaseBean {
     private Integer boxQty;
 
     @Transient
+    @ApiParam(value = "箱数")
+    private String boxQtyStr;
+
+    @Transient
     @ApiParam(value = "是否报工")
     private String isReport;
 
@@ -562,6 +566,9 @@ public class WmsStockSn extends BaseBean {
     @Transient
     @ApiParam("泊位")
     private String zdoc;
+    
+    @ApiParam("打印类型")
+    private Integer printType;
 
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {

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

@@ -1,18 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
 
-import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.Table;
+import javax.persistence.*;
 
 /**
  * @Description : ERP COGI快照
@@ -34,7 +29,7 @@ import javax.persistence.Table;
         @Index(columnList = "SNAPSHOT_TIME"),
         @Index(columnList = "MOVE_TYPE")
 })
-public class WmsErpCOGISnapshot extends SnapshotBean {
+public class WmsErpCOGISnapshot extends BaseBean {
     private static final long serialVersionUID = -4095222692227226944L;
 
     @Column(name="SNAPSHOT_TIME")