冲突

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

@@ -6620,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)
@@ -8384,4 +8349,38 @@ public class MesEnumUtil {
             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

@@ -1953,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)
@@ -2343,6 +2380,51 @@ 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)
@@ -4214,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;
@@ -6196,4 +6279,310 @@ public class MesPcnEnumUtil {
             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;
+        }
+    }
+
 }

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

@@ -7991,7 +7991,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;
@@ -9540,6 +9541,17 @@ 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;
         }
     }
 

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

@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_DATA_MIGRATION_CFG")
+@Api("MES数据迁移配置表")
+public class MesDataMigrationCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6445732389643648643L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN节点名称代码")
+    private String pcnCode;
+
+    @Column(name = "MIG_NAME")
+    @ApiParam("名称")
+    private String migName;
+
+    @Column(name = "REMARK")
+    @ApiParam("描述")
+    private String remark;
+
+//    @Column(name = "MIGRATION_CYCLE")
+//    @ApiParam("迁移周期")
+//    private String migrationCycle;
+//
+//    @Column(name = "NEXT_EXECUTION_TIME")
+//    @ApiParam("下次执行时间")
+//    private String nextExecutionTime;
+
+    @Column(name = "SRC_TABLE_NAME")
+    @ApiParam("来源表名")
+    private String srcTableName;
+
+    @Column(name = "SRC_QUERY_CONDITIONS")
+    @ApiParam("来源表查询条件")
+    private String srcQueryConditions;
+
+    @Column(name = "PROCESS_QTY")
+    @ApiParam(value = "每次处理行数", example = "0")
+    private Integer processQty;
+
+    @Column(name = "DEST_TABLE_NAME")
+    @ApiParam("目标表名")
+    private String destTableName;
+
+    @Column(name = "IS_PHYSICAL_DELETE")
+    @ApiParam(value = "是否物理删除", example = "0")
+    private Integer isPhysicalDelete;
+
+    @Column(name = "LAST_EXECUTION_TIME")
+    @ApiParam("末次迁移时间")
+    private String lastExecutionTime;
+
+    @Column(name = "LAST_MIGRATION_QTY")
+    @ApiParam(value = "末次迁移记录数", example = "0")
+    private Integer lastMigrationQty;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("执行错误日志")
+    private String errorMessage;
+
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String mcStartTime;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String mcEndTime;
+
+    /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) {
+        this.migName = migName;
+        this.remark = remark;
+        this.migrationCycle = migrationCycle;
+        this.nextExecutionTime = nextExecutionTime;
+        this.srcTableName = srcTableName;
+        this.srcQueryConditions = srcQueryConditions;
+        this.processQty = processQty;
+        this.destTableName = destTableName;
+        this.isPhysicalDelete = isPhysicalDelete;
+        this.lastExecutionTime = lastExecutionTime;
+        this.lastMigrationQty = lastMigrationQty;
+        this.errorMessage = errorMessage;
+        this.mcStartTime = mcStartTime;
+        this.mcEndTime = mcEndTime;
+    }*/
+}

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;
 

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/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/repository/MesDataMigrationCfgRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDataMigrationCfg;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MesDataMigrationCfgRepository extends BaseRepository<MesDataMigrationCfg, Long> {
+}

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

@@ -2802,7 +2802,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());
-        ;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3610,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);
         }
@@ -3628,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(customerSnRule.getCustomerPartNo())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
+        if (!StringUtils.isEmpty(customerSnRule.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(customerSnRule.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", 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);
@@ -3754,4 +3759,33 @@ public class MesHqlPack {
         }
         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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -753,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
 
     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) {
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo, String assignDateCode) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -769,6 +769,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         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) {

sonar-project.properties

@@ -5,9 +5,10 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 
 # defaults to project key
 sonar.projectName=i3plus-pojo
+
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
- 
+sonar.projectVersion=1.0-DEV-SNAPSHOT
+
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./
 #sonar.java.binaries=target