From 6fbfea417f0b9bb6a7f0fce5399a95114b2bb998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 13 May 2020 14:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=901804=20=E8=B4=A8=E6=A3=80=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java   | 2 +-
 .../main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java    | 2 +-
 2 files changed, 2 insertions(+), 2 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 092c66b..88836d3 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
@@ -2567,7 +2567,7 @@ public class MesEnumUtil {
         INCOMING_CHECK(5, "来料检验"),
         FIRST_CHECK(10, "首检"),
         ON_SITE_CHECK(20, "巡检"),
-        ND_CHECK(30, "末检"),
+        END_CHECK(30, "末检"),
         RC_CHECK(40, "发货检验");
 
         private int value;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java
index ad18404..c3f6856 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java
@@ -51,7 +51,7 @@ public class IfQcOrderDataModel extends BaseBean {
     private String matnr;
 
     @ApiParam("收货数量")
-    private String erfmg;
+    private Double erfmg;
 
     @ApiParam("计量单位")
     private String erfme;