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

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

@@ -22,10 +22,12 @@ public class MesEnumUtil {
 
         private Integer value;
         private String description;
+
         SPC_KEY_DATA_OBJECT_TYPE(Integer value, String description) {
             this.value = value;
             this.description = description;
         }
+
         public static String valueOfDesc(String val) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value.equals(val)) {
@@ -164,6 +166,7 @@ public class MesEnumUtil {
             this.isValid = isValid;
             this.description = description;
         }
+
         public int getIsValid() {
             return isValid;
         }
@@ -180,6 +183,7 @@ public class MesEnumUtil {
             this.description = description;
         }
     }
+
     /**
      * 排序方式
      */
@@ -2058,7 +2062,8 @@ public class MesEnumUtil {
         MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"),
         MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"),
         MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"),
-        MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入");
+        MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
+        MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入");
 
         private int value;
         private String service;
@@ -6054,52 +6059,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * MES_车型散件配置清单 	选配类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_OPTION_TYPE {
-
-        OPTION_PART(1, "选配件"),
-        BOM_DISASSEMBLY(2, "BOM拆解");
-
-        private int value;
-        private String description;
-
-        MES_OPTION_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;
-        }
-
-        public static Integer descriptionOfValue(String description) {
-            Integer tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * 数据格式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -7738,4 +7697,78 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * edi解析方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EDI_PARSE_TYPE {
+        JOB(10, "定时任务解析文件"),
+        SPARE_PARTS(20, "备件excel上传");
+
+        private int value;
+        private String description;
+
+        EDI_PARSE_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;
+        }
+    }
+
+    /**
+     * edi解析方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EDI_REPORT_TYPE {
+        JSP(1, "jsp解析"),
+        JSA(2, "jsa解析");
+
+        private int value;
+        private String description;
+
+        EDI_REPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -4358,52 +4358,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * MES_生产队列散件清单 	选配类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_OPTION_TYPE {
-
-        OPTION_PART(1, "选配件"),
-        BOM_DISASSEMBLY(2, "BOM拆解");
-
-        private int value;
-        private String description;
-
-        MES_OPTION_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;
-        }
-
-        public static Integer descriptionOfValue(String description) {
-            Integer tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * 绑定模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -148,4 +149,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "CUST_PROD_LINE_CODE")
     @ApiParam("客户产线代码")
     private String custProdLineCode;
+
+    @Column(name = "BASE_MODULE")
+    @ApiParam("BaseModule零件号")
+    private String baseModule;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/10 13:15
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Api("备件计划导入model")
+public class SparePartsImportModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("用户名")
+    private String userName;
+
+    @ApiParam("vin")
+    private String vinCode;
+
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @ApiParam("JIT顺序号")
+    private String jitSeq;
+
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @ApiParam("用量")
+    private Integer qty;
+
+    @ApiParam("单元格编号")
+    private Map<String, String> cellNoMap = new HashMap<>();
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/11 15:31
+ * @desc
+ */
+@Data
+public class SparePartsJspModel {
+
+    private MesQueueJitPlan queueJitPlan;
+
+    private List<MesQueueJitPlanBom> jitPlanBomList;
+
+    private List<MesQueueJitPlanDetail> jitPlanDetailList;
+}

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.mes.model.mgnbj;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.*;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Wynne.Lu
@@ -55,4 +57,8 @@ public class Part implements Serializable {
     @ApiParam("Mes物料号")
     private String partNo;
 
+    @ApiParam("单元格编号")
+    private Map<String, String> cellNoMap = new HashMap<>();
+
+
 }

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

@@ -2246,6 +2246,9 @@ public class MesHqlPack {
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesProduceSnTravel.getCreateDateTimeStart(),

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

@@ -117,6 +117,14 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("司机")
     public String driverNo;
 
+    @Column(name = "TMS_CAR_NO")
+    @ApiParam(value = "TMS车牌号")
+    private String tmsCarNo;
+
+    @Column(name = "TMS_DRIVER_NO")
+    @ApiParam("TMS司机")
+    public String tmsDriverNo;
+
     @Column(name = "CUST_ORDER_NO")
     @ApiParam(value = "客户单号")
     private String custOrderNo;

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

@@ -76,4 +76,26 @@ public class WmsDocSoDetails extends BaseBean {
     @Column(name = "CUST_PART_NO")
     @ApiParam("客户物料编码")
     public String custPartNo;
+
+
+    @Column(name = "REMAIN_QTY", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "剩余数量", example = "0")
+    public Double remainQty;
+
+    @Transient
+    @ApiParam(value = "存储区代码")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam(value = "单据编号")
+    private String docOrderNo;
+
+    @Transient
+    @ApiParam(value = "数量")
+    private Double docQty;
+
+    @Transient
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
 }

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

@@ -77,6 +77,14 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("司机")
     public String driverNo;
 
+    @Column(name = "TMS_CAR_NO")
+    @ApiParam(value = "TMS车牌号")
+    private String tmsCarNo;
+
+    @Column(name = "TMS_DRIVER_NO")
+    @ApiParam("TMS司机")
+    public String tmsDriverNo;
+
     @Column(name="ITEM")
     @ApiParam(value = "行号")
     public String item;