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

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

@@ -62,6 +62,10 @@ public class MesWorkCell extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private String name;
 
+    @Column(name = "WORK_CELL_TYPE")
+    @ApiParam("工位类型")
+    private String workCellType;
+
     public String getName(){
         return this.workCellName;
     }

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

@@ -13,19 +13,18 @@ public class MesEnumUtil {
 
 
     /**
-     * mes设备作业任务明细-执行状态
+     * mes 工位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
+    public enum MES_IS_REPEAT {
 
-        PENDING(10, "待处理"),
-        COMPLETE(20, "已完成"),
-        CANCEL(30, "取消");
+        REPEATABLE(1, "可重复"),
+        NOT_REPEAT(2, "不可重复");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) {
+        MES_IS_REPEAT(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -38,6 +37,17 @@ public class MesEnumUtil {
             return description;
         }
 
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_IS_REPEAT getByValue(int value) {
+            for (MES_IS_REPEAT 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++) {
@@ -51,18 +61,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业任务明细-整体结果
+     * mes 工位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_DETAIL_FINAL_RESULT {
+    public enum MES_WORK_CELL_TYPE {
 
-        YES(10, "合格"),
-        NO(20, "不合格");
+        NORMAL(1, "正常"),
+        REWORK(2, "返修");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) {
+        MES_WORK_CELL_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -75,6 +85,17 @@ public class MesEnumUtil {
             return description;
         }
 
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_WORK_CELL_TYPE getByValue(int value) {
+            for (MES_WORK_CELL_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++) {
@@ -88,18 +109,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业任务明细-维修标识
+     * pcn 动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
+    public enum MES_ACTION_TYPE {
 
-        FALSE(10, "否"),
-        TRUE(20, "是");
+        BIND(1, "绑定"),
+        UNTYING(2, "解绑");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) {
+        MES_ACTION_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -112,6 +133,17 @@ public class MesEnumUtil {
             return description;
         }
 
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_ACTION_TYPE getByValue(int value) {
+            for (MES_ACTION_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++) {
@@ -125,21 +157,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业状态
+     * pcn 是否是关键件
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_STATUS {
+    public enum MES_IS_KEY {
 
-        CREATE(10, "创建"),
-        LANDED(20, "下达"),
-        OPEN(30, "开启"),
-        CLOSE(40, "关闭"),
-        CANCEL(50, "取消");
+        IS_KEY(1, "是"),
+        NO_KEY(2, "否");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_STATUS(int value, String description) {
+        MES_IS_KEY(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -152,6 +181,17 @@ public class MesEnumUtil {
             return description;
         }
 
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_IS_KEY getByValue(int value) {
+            for (MES_IS_KEY 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++) {
@@ -165,19 +205,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业任务来源
+     * mes 维修状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_SOURCE {
+    public enum MES_REPAIR_STATUS {
 
-        PLAN(10, "周期计划"),
-        CREATE(20, "手工创建"),
-        ANDON(30, "ANDON");
+        REPAIRED(1, "已维修"),
+        NO_REPAIR(2, "待维修");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_SOURCE(int value, String description) {
+        MES_REPAIR_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -190,6 +229,17 @@ public class MesEnumUtil {
             return description;
         }
 
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_REPAIR_STATUS getByValue(int value) {
+            for (MES_REPAIR_STATUS 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++) {
@@ -203,18 +253,21 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业通知标识
+     * mes 操作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_NOTIFY_FLAG {
+    public enum MES_OPERATE_TYPE {
 
-        FALSE(10, "未通知"),
-        TRUE(20, "已通知");
+        WORKSTATION_SCAN(1, "工位扫描"),
+        QUALITY_JUDGEMENT(2, "质量判定"),
+        MATERIAL_DISMANTLING(3, "物料拆解"),
+        REWORK(4, "返修作业"),
+        WORKSTATION_MONITORING(5, "工位监控");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_NOTIFY_FLAG(int value, String description) {
+        MES_OPERATE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -227,6 +280,17 @@ public class MesEnumUtil {
             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++) {
@@ -240,7 +304,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes导入模块
+     * mes设备作业要求-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_INSERT_EXCEL {
@@ -289,10 +353,10 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备-作业类型
+     * mes设备作业要求-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_TYPE {
+    public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
 
         CHECK(10, "点检"),
         MAINTAIN(20, "保养"),
@@ -301,7 +365,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_EQU_TASK_TYPE(int value, String description) {
+        MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -922,7 +986,9 @@ public class MesEnumUtil {
     public enum PASS_FAIL {
 
         PASS(1, "合格"),
-        FAIL(2, "不合格");
+        FAIL(2, "不合格"),
+        SCRAP(3, "报废"),
+        DISMANTLED(4, "已拆解");
 
         private int value;
         private String description;
@@ -1469,7 +1535,6 @@ public class MesEnumUtil {
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
-        RUNNING_INFO("runningInfo", "运行信息"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
 
 

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

@@ -0,0 +1,42 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DEFECT")
+@Api("缺陷表")
+public class MesDefect extends BaseBean {
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "DEFECT_TYPE")
+    @ApiParam("缺陷类型")
+    private String defectType;
+}

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

@@ -0,0 +1,42 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DEFECT_CAUSE")
+@Api("缺陷原因表")
+public class MesDefectCause extends BaseBean {
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @Column(name = "DC_TYPE")
+    @ApiParam("缺陷原因类型")
+    private String dcType;
+}

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

@@ -0,0 +1,69 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 19:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_DEFECT_RECORD")
+@Api("不良信息记录表")
+public class MesDefectRecord extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name="DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name="DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name="DEFECT_LOCATION")
+    @ApiParam("缺陷位置")
+    private Integer defectLocation;
+
+    @Column(name="REPAIR_STATUS")
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,86 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 15:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DISMANTLE_RECORD")
+@Api("物料拆解记录表")
+public class MesDismantleRecord extends BaseBean {
+
+    @Column(name = "DISMANTLE_ID")
+    @ApiParam("拆解编号")
+    private String dismantleId;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "PARENT_PART_NAME")
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    private String sn;
+
+    @Column(name = "QTY")
+    @ApiParam("产品数量")
+    private Integer qty;
+
+    @Column(name = "DISMANTLE_QTY")
+    @ApiParam("拆解数")
+    private Integer dismantleQty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @Column(name = "OK_QTY")
+    @ApiParam("合格数")
+    private Integer okQty;
+
+    @Column(name = "MISS_QTY")
+    @ApiParam("缺失数")
+    private Integer missQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ApiParam("报废数")
+    private Integer scrapQty;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -52,6 +52,14 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("主键标记")
     private String fieldPk;
 
+    @Column(name = "FEED_FIELD")
+    @ApiParam("反馈字段")
+    private String feedField;
+
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
     @Column(name = "POJO_ATTR")
     @ApiParam("对应的pojo属性")
     private String pojoAttr;

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

@@ -0,0 +1,97 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :包装规格
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACK_SPEC")
+@Api("包装规格")
+public class MesPackSpec extends BaseBean {
+    @Column(name = "SPEC_CODE")
+    @ApiParam("包装规格代码")
+    private String specCode;
+
+    @Column(name = "SPEC_NAME")
+    @ApiParam("包装规格名称")
+    private String specName;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量", example = "0")
+    private Double qty;
+
+    @Column(name = "QTY2")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量2", example = "0")
+    private Double qty2;
+
+    @Column(name = "QTY3")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量3", example = "0")
+    private Double qty3;
+
+    @Column(name = "QTY4")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量4", example = "0")
+    private Double qty4;
+
+    @Column(name = "IS_MIXED")
+    @ApiParam("是否混包")
+    private Integer isMixed;
+
+    @Column(name = "IS_MIXED2")
+    @ApiParam("是否混包2")
+    private Integer isMixed2;
+
+    @Column(name = "IS_MIXED3")
+    @ApiParam("是否混包3")
+    private Integer isMixed3;
+
+    @Column(name = "IS_MIXED4")
+    @ApiParam("是否混包4")
+    private Integer isMixed4;
+
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getIsMixedVal() {
+        return this.isMixed == null ? 0 : this.isMixed;
+    }
+
+    public int getIsMixed2Val() {
+        return this.isMixed2 == null ? 0 : this.isMixed2;
+    }
+
+    public int getIsMixed3Val() {
+        return this.isMixed3 == null ? 0 : this.isMixed3;
+    }
+
+    public int getIsMixed4Val() {
+        return this.isMixed4 == null ? 0 : this.isMixed4;
+    }
+
+}

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

@@ -0,0 +1,92 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 1:26 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE")
+@Api("包装规格")
+public class MesPackage extends BaseBean {
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "PACK_SPEC_QTY")
+    @ApiParam("包装规格数量")
+    private Double packSpecQty;
+
+    @Column(name = "NUIT")
+    @ApiParam("包装规格数量")
+    private String nuit;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批号")
+    private String lotNo;
+
+    @Column(name = "PACK_SPEC")
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @Column(name = "IS_SEALED")
+    @ApiParam("是否封箱")
+    private Integer isSealed;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态10：未打印 20：已打印")
+    private Integer printStatus;
+
+    @Column(name = "PACK_LEVEL")
+    @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty = packSpecQty;
+    }
+}

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

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 2:55 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE")
+@Api("包装规格")
+public class MesPackageDetail extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品条码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("产品条码")
+    private String partNameRdd;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编码2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编码3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编码4")
+    private String packageNo4;
+
+
+}

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

@@ -0,0 +1,55 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 3:23 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE_TRAVEL")
+@Api("包装履历表")
+public class MesPackageTravel extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "OP_TYPE")
+    @ApiParam("操作类型")
+    private Integer opType;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编码2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编码3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编码4")
+    private String packageNo4;
+
+
+}

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

@@ -83,6 +83,10 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 
+    @Column(name = "IS_KEY")
+    @ApiParam(value = "是否关键件")
+    private Integer isKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

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

@@ -85,6 +85,14 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
+    @Column(name = "IS_KEY")
+    @ApiParam(value = "是否关键件")
+    private String isKey;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam(value = "动作类型")
+    private Integer actionType;
+
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
     }

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

@@ -0,0 +1,63 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 3:25 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_PACK")
+@Api("产品包装关系")
+public class MesProdPack extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "PACK_SPEC")
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Column(name = "PACK_LABEL_TEMPLATE2")
+    @ApiParam("包装标签模板2")
+    private String packLabelTemplate2;
+
+    @Column(name = "PACK_LABEL_TEMPLATE3")
+    @ApiParam("包装标签模板3")
+    private String packLabelTemplate3;
+
+    @Column(name = "PACK_LABEL_TEMPLATE4")
+    @ApiParam("包装标签模板4")
+    private String packLabelTemplate4;
+
+    @Column(name = "PROD_CFG_TYPE")
+    @ApiParam("项目")
+    private String prodCfgType;
+
+
+}

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

@@ -0,0 +1,46 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_CTGY_PICTURE")
+@Api("产品类型图片表")
+public class MesProduceCtgyPicture extends BaseBean {
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCtgyCode;
+
+    @Column(name = "SIDE_LOCATION")
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片URL")
+    private String pictureUrl;
+
+    @Column(name = "PICTURE_NAME")
+    @ApiParam("图片名称")
+    private String pictureName;
+}

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

@@ -105,6 +105,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
     @Column(name = "PACKAGE_SN")
     @ApiParam("包装条码")
     private String packageSn;
@@ -121,6 +125,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("返回信息")
     private String resultMsg;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,86 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_REPAIR_RECORD")
+@Api("维修信息记录表")
+public class MesRepairRecord extends BaseBean {
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "SIDE_LOCATION")
+    @ApiParam("产品面位")
+    private String sideLocation;
+
+    @Column(name = "DEFECT_LOCATION")
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "REPAIR_NAME")
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -0,0 +1,70 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCRAP_RECORD")
+@Api("报废信息记录表")
+public class MesScrapRecord extends BaseBean {
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "SCRAP_CODE")
+    @ApiParam("报废代码")
+    private String repairCode;
+
+    @Column(name = "SCRAP_NAME")
+    @ApiParam("报废名称")
+    private String scrapName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "SCRAP_REASON")
+    @ApiParam("报废原因")
+    private String scrapReason;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -42,4 +42,8 @@ public class MesWorkCell extends BaseBean {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    @Column(name = "WORK_CELL_TYPE")
+    @ApiParam("工位类型")
+    private String workCellType;
 }

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

@@ -49,6 +49,6 @@ public class MesWorkCenter extends BaseBean {
 
     @Column(name = "RUNNING_STATUS")
     @ApiParam("运行状态")
-    private Integer runningStatus;
+    private String runningStatus;
 
 }

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\18 19:15
+ * @Modify:
+ **/
+@Data
+@Api("mes 物料BOM")
+public class MesPartBomModel {
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    public MesPartBomModel() {
+
+    }
+
+    public MesPartBomModel(String partNo, String partName, Integer qty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.qty = qty;
+    }
+}

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

@@ -40,6 +40,7 @@ public class QueueOrderModel implements Serializable {
     @Transient
     @ApiParam("显示颜色")
     private String color;
+
     public QueueOrderModel() {
     }
 

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;
 
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
 
 import java.util.List;
 
@@ -15,6 +13,12 @@ import java.util.List;
  **/
 public class RequestModel {
 
+    private List<MesDefectRecord> mesDefectRecordList; // 不良/缺陷记录数据集
+
+    private List<MesRepairRecord> mesRepairRecordList; // 维修记录数据集
+
+    private List<MesDismantleRecord> dismantleRecordList; // 拆解记录数据集
+
     private List<MesWorkOrder> workOrderList; // 工单数据集
 
     private List<MesPart> partList; // 物料数据集
@@ -46,6 +50,30 @@ public class RequestModel {
         this.partList = partList;
     }
 
+    public List<MesDefectRecord> getMesDefectRecordList() {
+        return mesDefectRecordList;
+    }
+
+    public void setMesDefectRecordList(List<MesDefectRecord> mesDefectRecordList) {
+        this.mesDefectRecordList = mesDefectRecordList;
+    }
+
+    public List<MesRepairRecord> getMesRepairRecordList() {
+        return mesRepairRecordList;
+    }
+
+    public void setMesRepairRecordList(List<MesRepairRecord> mesRepairRecordList) {
+        this.mesRepairRecordList = mesRepairRecordList;
+    }
+
+    public List<MesDismantleRecord> getDismantleRecordList() {
+        return dismantleRecordList;
+    }
+
+    public void setDismantleRecordList(List<MesDismantleRecord> dismantleRecordList) {
+        this.dismantleRecordList = dismantleRecordList;
+    }
+
     public List<MesWorkOrder> getWorkOrderList() {
         return workOrderList;
     }

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-@Api("过程条码打印信息模板")
+@Api("打印信息模板")
 public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("打印描述")
     private String printDesc;
@@ -30,7 +30,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("批次号")
     private String batchNo;
 
-    @ApiParam("客户物料号")
+    @ApiParam("箱数量")
     private String boxQty;
 
     @ApiParam("订单号")
@@ -38,4 +38,10 @@ public class StepPrintSnModel extends MesProduceSn {
 
     @ApiParam("生产日期")
     private String productionTime;
+
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @ApiParam("包装规格")
+    private String packageSpec;
 }

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

@@ -0,0 +1,14 @@
+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.MesDefectCause;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:04
+ * @Modify:
+ **/
+public interface MesDefectCauseRepository extends BaseRepository<MesDefectCause, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesDefectRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:05
+ * @Modify:
+ **/
+public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesDefect;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:04
+ * @Modify:
+ **/
+public interface MesDefectRepository extends BaseRepository<MesDefect, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesDismantleRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:06
+ * @Modify:
+ **/
+public interface MesDismantleRecordRepository extends BaseRepository<MesDismantleRecord, Long> {
+}

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

@@ -0,0 +1,16 @@
+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.MesPackSpec;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPackSpecRepository extends BaseRepository<MesPackSpec, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesObjectCfg;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 10:33 上午
+ * @Description:
+ **/
+public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
+}

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

@@ -0,0 +1,13 @@
+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.MesPackage;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 10:39 上午
+ * @Description:
+ **/
+public interface MesPackageRepository extends BaseRepository<MesPackage, Long> {
+}

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

@@ -0,0 +1,13 @@
+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.MesPackageTravel;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 2:57 下午
+ * @Description:
+ **/
+public interface MesPackageTravelRepository extends BaseRepository<MesPackageTravel, Long> {
+}

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

@@ -0,0 +1,16 @@
+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.MesProdPack;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdPackRepository extends BaseRepository<MesProdPack, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesProduceCtgyPicture;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:35
+ * @Modify:
+ **/
+public interface MesProduceCtgyPictureRepository extends BaseRepository<MesProduceCtgyPicture, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesRepairRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:06
+ * @Modify:
+ **/
+public interface MesRepairRecordRepository extends BaseRepository<MesRepairRecord, Long> {
+}

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

@@ -0,0 +1,14 @@
+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.MesScrapRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 20:07
+ * @Modify:
+ **/
+public interface MesScrapRecordRepository extends BaseRepository<MesScrapRecord, Long> {
+}

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

@@ -82,6 +82,7 @@ public class MesHqlPack {
 
     /**
      * 获取工作中心下所有的投料数据
+     *
      * @param mesCellFeed
      * @param org
      * @return
@@ -96,6 +97,7 @@ public class MesHqlPack {
 
     /**
      * 获取原材料扫描信息的对应工序BOM
+     *
      * @param mesProcessBom
      * @param mesRawPartSn
      * @return

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DEFECT")
+@Api("缺陷表")
+public class MesDefect extends BaseBean {
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "DEFECT_TYPE")
+    @ApiParam("缺陷类型")
+    private String defectType;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DEFECT_CAUSE")
+@Api("缺陷原因表")
+public class MesDefectCause extends BaseBean {
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @Column(name = "DC_TYPE")
+    @ApiParam("缺陷原因类型")
+    private String dcType;
+}

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 15:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DISMANTLE_RECORD")
+@Api("物料拆解记录表")
+public class MesDismantleRecord extends BaseBean {
+
+    @Column(name = "DISMANTLE_ID")
+    @ApiParam("拆解编号")
+    private String dismantleId;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "PARENT_PART_NAME")
+    @ApiParam("产品物料名称")
+    private String parentPartName;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    private String sn;
+
+    @Column(name = "QTY")
+    @ApiParam("产品数量")
+    private Integer qty;
+
+    @Column(name = "DISMANTLE_QTY")
+    @ApiParam("拆解数")
+    private Integer dismantleQty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子物料名称")
+    private String itemPartName;
+
+    @Column(name = "OK_QTY")
+    @ApiParam("合格数")
+    private Integer okQty;
+
+    @Column(name = "MISS_QTY")
+    @ApiParam("缺失数")
+    private Integer missQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ApiParam("报废数")
+    private Integer scrapQty;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -52,6 +52,15 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("主键标记")
     private String fieldPk;
 
+    @Column(name = "FEED_FIELD")
+    @ApiParam("反馈字段")
+    private String feedField;
+
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
+
     @Column(name = "POJO_ATTR")
     @ApiParam("对应的pojo属性")
     private String pojoAttr;

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

@@ -37,22 +37,42 @@ public class MesPackSpec extends BaseBean {
     @ApiParam("包装规格名称")
     private String specName;
 
-    @Column(name="PARENT_SPEC")
-    @ApiParam("父包装规格代码")
-    private String parentSpec;
-
     @Column(name = "QTY")
     @ColumnDefault("0")
-    @ApiParam(value = "数量", example = "0")
+    @ApiParam(value = "包装数量", example = "0")
     private Double qty;
 
+    @Column(name = "QTY2")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量2", example = "0")
+    private Double qty2;
+
+    @Column(name = "QTY3")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量3", example = "0")
+    private Double qty3;
+
+    @Column(name = "QTY4")
+    @ColumnDefault("0")
+    @ApiParam(value = "包装数量4", example = "0")
+    private Double qty4;
+
     @Column(name = "IS_MIXED")
     @ApiParam("是否混包")
     private Integer isMixed;
 
-    @Column(name="SPEC_LEVEL")
-    @ApiParam("规格级别")
-    private Integer specLevel;
+    @Column(name = "IS_MIXED2")
+    @ApiParam("是否混包2")
+    private Integer isMixed2;
+
+    @Column(name = "IS_MIXED3")
+    @ApiParam("是否混包3")
+    private Integer isMixed3;
+
+    @Column(name = "IS_MIXED4")
+    @ApiParam("是否混包4")
+    private Integer isMixed4;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
@@ -62,7 +82,16 @@ public class MesPackSpec extends BaseBean {
         return this.isMixed == null ? 0 : this.isMixed;
     }
 
-    public int getSpecLevelVal() {
-        return this.specLevel == null ? 0 : this.specLevel;
+    public int getIsMixed2Val() {
+        return this.isMixed2 == null ? 0 : this.isMixed2;
+    }
+
+    public int getIsMixed3Val() {
+        return this.isMixed3 == null ? 0 : this.isMixed3;
     }
+
+    public int getIsMixed4Val() {
+        return this.isMixed4 == null ? 0 : this.isMixed4;
+    }
+
 }

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

@@ -0,0 +1,85 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 1:26 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE")
+@Api("包装规格")
+public class MesPackage extends BaseBean {
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "PACK_SPEC_QTY")
+    @ApiParam("包装规格数量")
+    private Double packSpecQty;
+
+    @Column(name = "NUIT")
+    @ApiParam("包装规格数量")
+    private String nuit;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批号")
+    private String lotNo;
+
+    @Column(name = "PACK_SPEC")
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @Column(name = "IS_SEALED")
+    @ApiParam("是否封箱")
+    private Integer isSealed;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态10：未打印 20：已打印")
+    private Integer printStatus;
+
+    @Column(name = "PACK_LEVEL")
+    @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+}

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 2:55 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE")
+@Api("包装规格")
+public class MesPackageDetail extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品条码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("产品条码")
+    private String partNameRdd;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编码2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编码3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编码4")
+    private String packageNo4;
+
+
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 3:23 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE_TRAVEL")
+@Api("包装履历表")
+public class MesPackageTravel extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "OP_TYPE")
+    @ApiParam("操作类型")
+    private Integer opType;
+
+    @Column(name = "PACKAGE_NO2")
+    @ApiParam("包装编码2")
+    private String packageNo2;
+
+    @Column(name = "PACKAGE_NO3")
+    @ApiParam("包装编码3")
+    private String packageNo3;
+
+    @Column(name = "PACKAGE_NO4")
+    @ApiParam("包装编码4")
+    private String packageNo4;
+
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 15:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_OBJECT")
+@Api("物料对象配置表")
+public class MesPartObject extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("物料名称")
+    private String objectName;
+}

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

@@ -87,6 +87,10 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 
+    @Column(name = "IS_KEY")
+    @ApiParam(value = "是否关键件")
+    private Integer isKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

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

@@ -86,6 +86,14 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
+    @Column(name = "IS_KEY")
+    @ApiParam(value = "是否关键件")
+    private String isKey;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam(value = "动作类型")
+    private String actionType;
+
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;
     }

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/18 3:25 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_PACK")
+@Api("产品包装关系")
+public class MesProdPack extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "PACK_SPEC")
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Column(name = "PACK_LABEL_TEMPLATE2")
+    @ApiParam("包装标签模板2")
+    private String packLabelTemplate2;
+
+    @Column(name = "PACK_LABEL_TEMPLATE3")
+    @ApiParam("包装标签模板3")
+    private String packLabelTemplate3;
+
+    @Column(name = "PACK_LABEL_TEMPLATE4")
+    @ApiParam("包装标签模板4")
+    private String packLabelTemplate4;
+
+    @Column(name = "PROD_CFG_TYPE")
+    @ApiParam("项目")
+    private String prodCfgType;
+
+
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_CTGY_PICTURE")
+@Api("产品类型图片表")
+public class MesProduceCtgyPicture extends BaseBean {
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCtgyCode;
+
+    @Column(name = "SIDE_LOCATION")
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片URL")
+    private String pictureUrl;
+
+    @Column(name = "PICTURE_NAME")
+    @ApiParam("图片名称")
+    private String pictureName;
+}

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

@@ -105,6 +105,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
     @Column(name = "PACKAGE_SN")
     @ApiParam("包装条码")
     private String packageSn;

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

@@ -75,6 +75,7 @@ public class MesQueueOrderDetail extends BaseBean {
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
+
     public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_REPAIR_RECORD")
+@Api("维修信息记录表")
+public class MesRepairRecord extends BaseBean {
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Column(name = "SIDE_LOCATION")
+    @ApiParam("产品面位")
+    private String sideLocation;
+
+    @Column(name = "DEFECT_LOCATION")
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "REPAIR_NAME")
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "DC_NAME")
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -36,4 +36,8 @@ public class MesScrap extends BaseBean {
     @ApiParam("报废名称")
     private String scrapName;
 
+    @Column(name="SCRAP_TYPE")
+    @ApiParam("报废类型")
+    private String scrapType;
+
 }

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCRAP_RECORD")
+@Api("报废信息记录表")
+public class MesScrapRecord extends BaseBean {
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "SCRAP_CODE")
+    @ApiParam("报废代码")
+    private String repairCode;
+
+    @Column(name = "SCRAP_NAME")
+    @ApiParam("报废名称")
+    private String scrapName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String meno;
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 14:22
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TYPE_CFG")
+@Api("类型信息表")
+public class MesTypeCfg extends BaseBean {
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam("类型代码")
+    private String typeCode;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam("类型名称")
+    private String typeName;
+
+    @Column(name = "BUSINESS_TYPE_CODE")
+    @ApiParam("业务类型代码")
+    private String businessTypeCode;
+
+    @Column(name = "BUSINESS_TYPE_NAME")
+    @ApiParam("业务类型名称")
+    private String businessTypeName;
+}

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

@@ -47,6 +47,10 @@ public class MesWorkCell extends BaseBean {
     @ApiParam("生产区域代码")
     private String areaCode;
 
+    @Column(name = "WORK_CELL_TYPE")
+    @ApiParam("工位类型")
+    private String workCellType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java

@@ -48,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean {
     @Transient
     private CompiledScript compiledScript;
 
-    public EngineScriptPersistence() {}
+    public EngineScriptPersistence() {
+    }
 
     // 构造方法，便于批量创建数据
     public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType,

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

@@ -37,7 +37,6 @@ public class MesEventActionModel implements Serializable {
     private String eventCode;
 
 
-
     @ApiParam("序号")
     private Integer seq;
 

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

@@ -41,6 +41,7 @@ public class QueueOrderModel implements Serializable {
     @Transient
     @ApiParam("显示颜色")
     private String color;
+
     public QueueOrderModel() {
     }
 

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDefectCause;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 16:56
+ * @Modify:
+ **/
+public interface MesDefectCauseRepository extends BaseRepository<MesDefectCause, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 15:24
+ * @Modify:
+ **/
+public interface MesDefectRepository extends BaseRepository<MesDefect, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
+
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 10:33 上午
+ * @Description:
+ **/
+public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
+
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 10:39 上午
+ * @Description:
+ **/
+public interface MesPackageRepository extends BaseRepository<MesPackage, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/19 2:57 下午
+ * @Description:
+ **/
+public interface MesPackageTravelRepository extends BaseRepository<MesPackageTravel, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdPack;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdPackRepository extends BaseRepository<MesProdPack, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 15:44
+ * @Modify:
+ **/
+public interface MesProduceCtgyPictureRepository extends BaseRepository<MesProduceCtgyPicture, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesTypeCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\16 16:29
+ * @Modify:
+ **/
+public interface MesTypeCfgRepository extends BaseRepository<MesTypeCfg, Long> {
+}

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

@@ -978,9 +978,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
-        if (!StringUtils.isEmpty(packSpec.getParentSpec())) {
-            DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean);
-        }
+//        if (!StringUtils.isEmpty(packSpec.getSpecCode())) {
+//            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean);
+//        }
 
         return packBean;
     }
@@ -1238,6 +1238,7 @@ public class MesHqlPack {
 
     /**
      * 工单审批查询
+     *
      * @param mesWorkOrder
      * @param organizeCode
      * @return
@@ -1259,6 +1260,7 @@ public class MesHqlPack {
 
     /**
      * MES Plc设备信息配置查询条件封装
+     *
      * @param mesPlc
      * @param organizeCode
      * @return
@@ -1288,6 +1290,7 @@ public class MesHqlPack {
 
     /**
      * MES DB地址清单查询条件封装
+     *
      * @param mesDatasource
      * @param organizeCode
      * @return
@@ -1308,6 +1311,7 @@ public class MesHqlPack {
 
     /**
      * MES 设备故障处理方法查询条件封装
+     *
      * @param mesFaultMethod
      * @param organizeCode
      * @return
@@ -1328,6 +1332,7 @@ public class MesHqlPack {
 
     /**
      * MES 设备故障原因查询条件封装
+     *
      * @param mesFaultCause
      * @param organizeCode
      * @return
@@ -1348,6 +1353,7 @@ public class MesHqlPack {
 
     /**
      * MES 设备故障现象查询条件封装
+     *
      * @param mesFaultPhenomenon
      * @param organizeCode
      * @return
@@ -1368,6 +1374,7 @@ public class MesHqlPack {
 
     /**
      * MES 过程质量检验查询条件封装
+     *
      * @param mesQcCheckStandard
      * @param organizeCode
      * @return
@@ -1391,4 +1398,87 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES 缺陷查询条件封装
+     * @param mesDefect
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDefect(MesDefect mesDefect, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefect, organizeCode);
+        if (!StringUtils.isEmpty(mesDefect.getDefectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesDefect.getDefectCode(), "defectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDefect.getDefectName())) {
+            DdlPreparedPack.getStringLikerPack(mesDefect.getDefectName(), "defectName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDefect.getDefectType())) {
+            DdlPreparedPack.getStringLikerPack(mesDefect.getDefectType(), "defectType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 产品类型图片查询条件封装
+     * @param mesProduceCtgyPicture
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
+        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 类型信息查询条件封装
+     * @param mesTypeCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesTypeCfg.getTypeName())) {
+            DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeName(), "typeName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeName())) {
+            DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeName(), "businessTypeName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 缺陷原因查询条件封装
+     * @param mesDefectCause
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDefectCause, organizeCode);
+        if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) {
+            DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDefectCause.getDcName())) {
+            DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDefectCause.getDcType())) {
+            DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcType(), "dcType", packBean);
+        }
+        return packBean;
+    }
 }