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

 Conflicts:

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

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

@@ -181,6 +181,10 @@ public class AndonManageQueue extends BaseManageQueue {
     @ApiParam(value = "放行说明")
     private String openInfo;
 
+    @Column(name = "IS_OVER_TIME")
+    @ApiParam(value = "是否超时")
+    private Integer overTimeFlag;
+
     @Transient
     @ApiParam(value = "安灯状态集合")
     private List<String> statusCodeList;

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

@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description: 安灯通知记录表
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-11-11-14:23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_MESSAGE_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("通知记录")
+public class AndonMessageRecord extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    private String andonOrderNo;
+
+    @Column(name = "ALARM_CODE")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @Column(name = "STATUS_CODE")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
+    @ApiParam(value = "安灯状态代码")
+    private String statusCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象代码")
+    private String rpObjectCode;
+
+    @Transient
+    @ApiParam(value = "通知对象名称")
+    private String rpObjectName;
+
+    @Column(name = "RP_CODE")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @ApiParam(value = "通知方式")
+    private String rpCode;
+
+    @Column(name = "RP_NAME")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @ApiParam(value = "通知方式名称")
+    private String rpName;
+
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知等级")
+    private String rpLevel;
+
+    @Column(name = "IS_SUCCEED")
+    @ApiParam(value = "成功标识")
+    private String isSucceed;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    private String memo;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference: 通知方式
+ * @Author: Crish
+ * @CreateDate:2019-11-11-14:23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RESPONSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("通知方式")
+public class AndonResponse extends BaseBean {
+
+    @Column(name = "RESPONSE_CODE")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @ApiParam(value = "通知方式")
+    private String responseCode;
+
+    @Column(name = "RESPONSE_NAME")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @ApiParam(value = "通知名称")
+    private String responseName;
+
+    @Column(name = "RESPONSE_CONTENT")
+    @ApiParam(value = "通知内容")
+    private String responseContent;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-11-12-10:21
+ * @Modify:
+ **/
+@Data
+public class AndonBoardModel {
+
+    @ApiParam("安灯类型")
+    private String  alarmCode;
+
+    @ApiParam("安灯类型名称")
+    private String  alarmName;
+
+    @ApiParam("安灯正常处理的次数")
+    private Integer inTime;
+
+    @ApiParam("安灯超时次数")
+    private Integer overTime;
+
+    @ApiParam("安灯总次数")
+    private Integer totalTime;
+
+    public int getTotalTimeVal() {
+        return totalTime == null ? 0 : totalTime;
+    }
+
+    public int getOverTimeVal() {
+        return overTime == null ? 0 : overTime;
+    }
+
+    public int getInTime() {
+        return inTime == null ? 0 : inTime;
+    }
+
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-11-12-14:24
+ * @Modify:
+ **/
+@Repository
+public interface IAndonMessageRecordRepository extends BaseRepository<AndonMessageRecord, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonResponseRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description: 通知方式
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-11-11-15:12
+ * @Modify:
+ **/
+@Repository
+public interface IAndonResponseRepository extends BaseRepository<AndonResponse, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -20,7 +20,38 @@ import org.apache.commons.lang3.StringUtils;
  * @Modify:
  **/
 public class AndonHqlPack {
-    /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
+
+    /**
+     * 安灯通知方式查询封装
+     * @param andonResponse
+     * @return
+     */
+    public static DdlPackBean getAndonResponse(AndonResponse andonResponse) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonResponse.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonResponse.getResponseCode(), "responseCode", packBean);
+        return packBean;
+    }
+
+    /**
+     * 安灯通知记录查询条件封装
+     * @param andonMessageRecord
+     * @return
+     */
+    public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
+        if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){
+            DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
     /**
      * 工作单元呼叫原因配置查询条件封装
      * @param andonCellAlarmCause
@@ -137,7 +168,6 @@ public class AndonHqlPack {
         DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
         return packBean;
     }
-    /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
 
 
     /**

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

@@ -12,6 +12,201 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class AndonEnumUtil {
     /**
+     * 成功失败标识
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_SUCCESS_FLAG{
+        SUCCESS(1, "1","成功"),
+        FAIL(2, "2","失败");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ANDON_SUCCESS_FLAG(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;
+        }
+
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String val) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfCode(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 通知超时标识
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_OVER_TIME_FLAG{
+        CALL(1,"呼叫超时"),
+        SIGN(2,"响应超时");
+
+        private int value;
+        private String description;
+
+        NOTICE_OVER_TIME_FLAG(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;
+        }
+
+        public static int descriptionOfValue(String val) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 广播内容占位符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BROADCAST_CUSTOM_CONDITION {
+        LINE("{A}","workCenterCode","产线代码"),
+        LINE_NAME("{B}","workCenterName","产线名称"),
+        CELL("{C}","workCellCode","工位代码"),
+        CELL_NAME("{D}","workCellName","工位名称"),
+        ALARM_CODE("{E}","alarmCode","安灯类型代码"),
+        ALARM_NAME("{F}","alarmName","安灯类型名称"),
+        CALL_USER("{G}","callUser","呼叫人名称"),
+        ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"),
+        ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"),
+        AC_CODE("{J}","acCode","事件描述代码"),
+        AC_NAME("{K}","acNameRdd","事件描述名称");
+
+        private String value;
+        private String code;
+        private String description;
+
+        BROADCAST_CUSTOM_CONDITION(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode(){ return code; }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfCode(String desc) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
      * 按灯状态
      * 10-是，20-否
      */
@@ -517,8 +712,6 @@ public class AndonEnumUtil {
         }
     }
 
-
-
     /**
      * 优先级别
      * 10 - 一级，20 - 二级，30 - 三级

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

@@ -26,7 +26,6 @@ public class MesEnumUtil {
         MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"),
         MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"),
         MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"),
-        MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"),
         MES_EVENT("MesEvent", "MES_EVENT", "事件清单"),
         MES_METHOD("MesMethod", "MES_METHOD", "方法清单"),
         MES_ACTION("MesAction", "MES_ACTION", "动作"),

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

@@ -13,6 +13,93 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 条码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PRODUCE_SN_TYPE {
+
+        NORMAL(10, "正常件"),
+        FIRST_INSPECTION(20, "首检件");
+
+        private int value;
+        private String description;
+
+        MES_PRODUCE_SN_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * pcn 操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_OPERATE_TYPE {
+
+        WORKSTATION_SCAN(10, "工位扫描"),
+        QUALITY_JUDGEMENT(20, "质量判定"),
+        MATERIAL_DISMANTLING(30, "物料拆解"),
+        REWORK(40, "返修作业"),
+        WORKSTATION_MONITORING(50, "工位监控");
+
+        private int value;
+        private String description;
+
+        MES_OPERATE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_OPERATE_TYPE getByValue(int value) {
+            for (MES_OPERATE_TYPE mesInsertExcel : values()) {
+                if (mesInsertExcel.getValue() == value) {
+                    return mesInsertExcel;
+                }
+            }
+            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;
+        }
+
+    }
+
+    /**
      * MesProductEncodeCfg 匹配类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2055,4 +2142,38 @@ public class MesPcnEnumUtil {
     }
 
 
+    @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/WmsEnumUtil.java

@@ -638,10 +638,10 @@ public class WmsEnumUtil {
         KT_REWORK(380, "KT_REWORK", "KT返工"),
         KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
         KT_SORTING(400, "KT_SORTING", "KT分选"),
-		VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"),
-		VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询"),
-        KT_PURCHASE_RC(420,"KT_PURCHASE_RC", "采购收货");;
-
+		VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
+		VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
+        KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
+		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理");
 
 
         private int value;
@@ -823,7 +823,8 @@ public class WmsEnumUtil {
         VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
         VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
         VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"),
-		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点");
+		VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
+        VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理");
         private String value;
         private String description;
 
@@ -898,7 +899,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
+        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
+        , CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -931,24 +933,27 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
-     * 单据是否生成任务状态
+     * 业务表：库存条码状态
+     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum IS_GENERAL_TASK {
-        CREATE(10, "CREATE", "创建"),
-        INIT(20, "INIT", "初始化"),
-        IS_GENERAL(30, "IS_GENERAL", "已生成"),
-        NO_GENERAL(40, "NO_GENERAL", "不生成"),
-        CANCEL(50, "CANCEL", "撤销");
+    public enum STOCK_SN_STATUS {
+        CREATE(10, "创建"),
+        QUALITY_CONTROL(20, "质检中"),
+        PRE_INSTOCK(30, "待入库"),
+        INSTOCKED(40, "入库"),
+        PICKED(50, "配料"),
+        OUT_STOCK(60, "出库"),
+        COMMING(80, "在途");
 
         private int value;
-        private String code;
         private String description;
 
-        IS_GENERAL_TASK(int value, String code, String description) {
+        STOCK_SN_STATUS(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -960,10 +965,6 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public String getCode() {
-            return code;
-        }
-
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -974,6 +975,10 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -983,32 +988,25 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
     }
-
-
     /**
-     * 业务表：库存条码状态
-     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
+     * 单据是否生成任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STOCK_SN_STATUS {
-        CREATE(10, "创建"),
-        QUALITY_CONTROL(20, "质检中"),
-        PRE_INSTOCK(30, "待入库"),
-        INSTOCKED(40, "入库"),
-        PICKED(50, "配料"),
-        OUT_STOCK(60, "出库"),
-        COMMING(80, "在途");
+    public enum IS_GENERAL_TASK {
+        CREATE(10, "CREATE", "创建"),
+        INIT(20, "INIT", "初始化"),
+        IS_GENERAL(30, "IS_GENERAL", "已生成"),
+        NO_GENERAL(40, "NO_GENERAL", "不生成"),
+        CANCEL(50, "CANCEL", "撤销");
 
         private int value;
+        private String code;
         private String description;
 
-        STOCK_SN_STATUS(int value, String description) {
+        IS_GENERAL_TASK(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -1020,6 +1018,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1030,10 +1032,6 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
-
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1043,8 +1041,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-    }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 业务表：库存条码质检状态
      */
@@ -1356,20 +1357,22 @@ public class WmsEnumUtil {
     }
 
 
+
     /**
-     * 质检业务类型
+     * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_INFO_TYPE {
-        FEED(10, "进料检验"),
-        ONLINE(20, "在线检验"),
-        EMDPRODUCT(30, "成品检验"),
-        SHIPMENTS(40, "出货检验");
+    public enum QC_INFO_STATUS {
+        CREATE(10, "新建"),
+        FINISH(20, "处理中"),
+        FAIL(30, "已完成"),
+        CLOSE(40, "已关闭"),
+        CANCEL(50, "已取消");
 
         private int value;
         private String description;
 
-        QC_INFO_TYPE(int value, String description) {
+        QC_INFO_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1391,27 +1394,20 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
     }
 
     /**
-     * 质检业务状态
+     * 质检明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_INFO_STATUS {
-        CREATE(10, "新建"),
-        FINISH(20, "处理中"),
-        FAIL(30, "已完成"),
-        CLOSE(40, "已关闭"),
-        CANCEL(50, "已取消");
+    public enum QC_ITEM_STATUS {
+        NORMAL(10, "正常"),
+        CANCELLATION(20, "已处理");
 
         private int value;
         private String description;
 
-        QC_INFO_STATUS(int value, String description) {
+        QC_ITEM_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1434,19 +1430,20 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-
     /**
-     * 质检明细状态
+     * 质检业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_ITEM_STATUS {
-        NORMAL(10, "正常"),
-        CANCELLATION(20, "已处理");
+    public enum QC_INFO_TYPE {
+        FEED(10, "进料检验"),
+        ONLINE(20, "在线检验"),
+        EMDPRODUCT(30, "成品检验"),
+        SHIPMENTS(40, "出货检验");
 
         private int value;
         private String description;
 
-        QC_ITEM_STATUS(int value, String description) {
+        QC_INFO_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1468,8 +1465,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-    }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 作业记录参数状态
      */
@@ -3747,7 +3747,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SN_OPERATE_TYPE {
         REPORT(10, "REPORT", "生产报工"),
-        BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错");
+        BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"),
+        REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销");
 
         private int value;
         private String code;

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes客户表
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CUSTOMER_PART")
+@Api("客户零件关系")
+public class MesCustomerPart extends BaseBean {
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerPartRepository extends BaseRepository<MesCustomerPart, Long> {
+
+}