From d0c62b9b2d7b82c01ef5f5c453f06a729489a7ce Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Sun, 1 Aug 2021 09:42:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?16909=2019081-=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E5=8D=95=E5=AF=BC=E5=85=A5XLS=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=98=AF=E3=80=90=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E6=8A=A5=E5=BA=9F=E3=80=91=EF=BC=8C=E8=80=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E6=AD=A3=E5=B8=B8=E7=9A=84=E3=80=90=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8D=95=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/WmsEnumUtil.java    | 1 +
 1 file changed, 1 insertion(+)

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 3354e36..b55bde9 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
@@ -9594,6 +9594,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRAP_TYPE {
+        NORMAL_SCRAP(0, "NORMAL", "生产报废"),
         ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
         AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
 

From 20029216eae8b8d12a2675cc44631c7cba5cadb8 Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Mon, 2 Aug 2021 10:16:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?16919=2019081-=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E5=8D=95=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 41c8480..8e8e88e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -424,6 +424,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
     public Integer scrapType;
 
+    @Transient
+    @ApiParam("报废类型名字")
+    public String scrapTypeName;
+
 
 
     public String getRecommondLot() {

From 84f686b54e18f319cff52f4c3631c668440e0dad Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Mon, 2 Aug 2021 16:19:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E9=9B=B6=E6=98=9F?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8C=85=E8=A3=85=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 8e8e88e..7b460fa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -158,6 +158,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("维修名称")
     private String repairName;
 
+    @Column(name = "SPEC_CODE")
+    @ApiParam("包装代码")
+    private String specCode;
+
     @Transient
     @ApiParam(value = "完成状态")
     public Integer orderStatus;