From b0faa179d1e766c25cdeb63ce6be0f4a43b7c7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Wed, 5 Jun 2019 19:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=8A=B6=E6=80=81=E4=BB=8E?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E7=A7=BB=E5=85=A5=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 0a3be6b..ddcddea 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -802,7 +802,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        FRAZE(70, "报废"),
+//        FRAZE(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -847,7 +847,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
 
         private int value;
         private String code;