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

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

@@ -1803,7 +1803,8 @@ public class MesEnumUtil {
         MES_PLC(390, "PLC地址清单"),
         MES_PROCESS(400, "工序信息"),
         MES_KPSN_RULE(410, "关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
+        MES_PART_BOM_IMPORT(430, "散件BOM导入");
 
         private int value;
         private String description;
@@ -4759,4 +4760,91 @@ public class MesEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * 产品特性
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TRAIT {
+        NORMAL(10, "正常件"),
+        FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
+
+        private int value;
+        private String description;
+
+        PART_TRAIT(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 String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 配置类型
+     */
+    /**
+     * mes工步类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_CFG_TYPE {
+
+        NORMAL("10", "正常"),
+        SCATTERED("20", "散件");
+
+        private String value;
+        private String description;
+
+        PROD_CFG_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -37,6 +37,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

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

@@ -56,6 +56,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String sn;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "QTY")
     @ApiParam("产品数量")
     private Double qty;

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

@@ -92,6 +92,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @Column(name = "PART_TRAIT")
+    @ApiParam("物料特性")
+    private Integer partTrait;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -39,4 +39,7 @@ public class ExcelImportResultModel<T> implements Serializable {
     @ApiParam("导入数据集合")
     private List<T> excelList;
 
+    @ApiParam("导入进度")
+    private String importSpeed;
+
 }

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

@@ -0,0 +1,118 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.LinkedList;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("散件BOM导入MODEL")
+public class ImportBomExcelDataModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件名称")
+    private String partName;
+
+    @ApiParam("零件简称")
+    private String briefText;
+
+    @ApiParam("零件规格")
+    private String partSpec;
+
+    @ApiParam("分类1")
+    private String categoryCode1;
+
+    @ApiParam("分类2")
+    private String categoryCode2;
+
+    @ApiParam("分类3")
+    private String categoryCode3;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("包装规格代码")
+    private String packSpecCode;
+
+    @ApiParam("默认工作中心")
+    private String defaultWorkCenter;
+
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @ApiParam("过程编码匹配类型")
+    private Integer processMatchType;
+
+    @ApiParam("包装编码匹配类型")
+    private Integer packageMatchType;
+
+    @ApiParam("产品编码匹配类型")
+    private Integer productMatchType;
+
+    @ApiParam("产品类型代码")
+    private String pptCode;
+
+    @ApiParam("物料特性")
+    private Integer partTrait;
+
+    @ApiParam("产品类型名称")
+    private String produceCategoryName;
+
+    @ApiParam("过程编码匹配类型名称")
+    private String processMatchTypeName;
+
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchTypeName;
+
+    @ApiParam("产品编码匹配类型")
+    private String productMatchTypeName;
+
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("产出工位")
+    private String workCellCode;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @ApiParam("消耗工位")
+    private String usedWorkCellCode;
+
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @ApiParam("配置")
+    private LinkedList<String> cfgCodeList;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("用户名")
+    private String userName;
+
+    @ApiParam("关键物料类型")
+    private String keyPartType;
+
+    @ApiParam("是否关键件")
+    private Integer isKeyPart;
+}

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

@@ -24,4 +24,7 @@ public class MesRouteCfgModel {
 
     @ApiParam("流程代码")
     private String routeCode;
+
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
 }

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

@@ -18,8 +18,5 @@ public class MesRouteCfgParamModel {
     @ApiParam("工序代码")
     private String processCode;
 
-    @ApiParam("是否执行 1=是 2=否")
-    private Integer isActive;
-
     List<MesRouteCfgStepModel> stepModelList;
 }

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

@@ -18,5 +18,11 @@ public class MesRouteCfgStepModel {
     @ApiParam("工步代码")
     private String stepCode;
 
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数值")
+    private String paramValue;
+
     List<MesRouteCfgModel> routeCfgModelList;
 }