From 9ea42cd032b6890d68d5b43c1dc5af56888800e5 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Mon, 16 Aug 2021 14:29:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?16818=2020135-=E7=83=AD=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=B2=A1=E6=9C=89=E5=AE=9A=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?CMS=E6=A0=87=E7=AD=BE=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java
index ddec01b..3482ee6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java
@@ -4,17 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -30,7 +25,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PACKAGE")
+@Table(name = "IF_PACKAGE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "MODIFY_DATE_TIME")})
 @Api("包装条码接口表")
 public class IfPackage extends BaseBean implements Serializable {
 

From 98fb50c05974d4b237a5baf3d1f3b7b1e6d5e5de Mon Sep 17 00:00:00 2001
From: "andly.pan" <andly.pan@estsh.com>
Date: Tue, 17 Aug 2021 10:32:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: andly.pan <andly.pan@estsh.com>
---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 b55bde9..3a4ff36 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
@@ -1229,7 +1229,9 @@ public class WmsEnumUtil {
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
         SCRAP(70, "报废"),
-        COMMING(80, "在途");
+        COMMING(80, "在途"),
+        INSPECTION(90,"待检验"),
+        HAS_INSPECTION(100,"已检验");
 
         private int value;
         private String description;
@@ -1396,8 +1398,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
         NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
-        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
-
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"),
+        REWORK(50,"REWORK","返工");
         private int value;
         private String code;
         private String description;