备件导入增加列

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

@@ -7899,7 +7899,6 @@ public class MesEnumUtil {
     }
 
 
-
     /**
      * 物料 物料类型1
      */
@@ -8095,4 +8094,53 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 展示供应商代码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHOW_SUPPLIER_CODE {
+        MGN(10, "麦格纳"),
+        OTHER(20, "其他"),
+        ALL(99, "全部");
+
+        private int value;
+        private String description;
+
+        SHOW_SUPPLIER_CODE(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 MesEnumUtil.SHOW_SUPPLIER_CODE getByValue(Integer value) {
+            for (MesEnumUtil.SHOW_SUPPLIER_CODE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -145,6 +145,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("通知标识")
     private Integer noticeSign = 10;
 
+    @Column(name = "REPLACE_VIN_CODE")
+    @ApiParam("替换vin")
+    private String replaceVinCode;
+
     @Transient
     @ApiParam("创建时间")
     private String cdtTruncated;

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

@@ -118,4 +118,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Transient
     @ApiParam("计划上线结束时间")
     private String planEndDate;
+
+    @Transient
+    @ApiParam("替换vin")
+    private String replaceVinCode;
 }

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

@@ -176,6 +176,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("结束时间")
     private String endTime;
 
+    @Transient
+    @ApiParam("数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
     public MesQueueOrder(){}
 
     public int getStatusVal() {
@@ -205,7 +213,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
                                Integer queueType,Integer status,String createUser,
                          String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
-                         String workCenterCode, String workCellCode) {
+                         String workCenterCode, String workCellCode, Double qty, Double finsihQty) {
         this.id = id;
         this.seq = seq;
         this.partNo = partNo;
@@ -221,6 +229,8 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.orderNo = orderNo;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
+        this.qty = qty;
+        this.finsihQty = finsihQty;
     }
 
 }

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

@@ -52,6 +52,9 @@ public class SparePartsImportModel {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @ApiParam("替换VIN")
+    private String replaceVinCode;
+
     @ApiParam("用量")
     private Integer qty;
 

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

@@ -2489,6 +2489,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
         }
+        if (!StringUtils.isEmpty(queueJitActual.getReplaceVinCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getReplaceVinCode(), "replaceVinCode", packBean);
+        }
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);
         }