From ebf03920578ee850c211e24418f5345a0aa7e517 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 12 Oct 2020 14:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99optionType?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 46 ----------------------
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 46 ----------------------
 .../model/excel/mgnbj/SparePartsImportModel.java   |  2 +-
 3 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 32fd382..3af6f5c 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -6059,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)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 8e8a55f..99133a8 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/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)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java
index d649fd4..91fb090 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java
@@ -53,7 +53,7 @@ public class SparePartsImportModel {
     private String custPartNo;
 
     @ApiParam("用量")
-    private Double qty;
+    private Integer qty;
 
     @ApiParam("单元格编号")
     private Map<String, String> cellNoMap = new HashMap<>();