From 1f307b709a667764c452f75876bf94defd691ea6 Mon Sep 17 00:00:00 2001
From: admin <admin>
Date: Tue, 28 Sep 2021 13:21:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?=
 =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?=
 =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index e7cee0f..acc368f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -604,6 +604,32 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("打印类型")
     private Integer printType;
 
+    @Transient
+    @ApiParam("30天以下")
+    private double thirtyDays;
+
+    @Transient
+    @ApiParam("30-60天")
+    private double thirtyToSixtyDays;
+
+    @Transient
+    @ApiParam("60-90天")
+    private double sixtyToNinetyDays;
+
+    @Transient
+    @ApiParam("90天以上")
+    private double morhanDays;
+
+    public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) {
+        setZoneNo(zoneNo);
+        setLotNo(lotNo);
+        setPartNo(partNo);
+        this.thirtyDays = thirtyDays;
+        this.thirtyToSixtyDays = thirtyToSixtyDays;
+        this.sixtyToNinetyDays = sixtyToNinetyDays;
+        this.morhanDays = morhanDays;
+    }
+
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
         this.sn = sn;

From 1493cf59e158a02ee26f2a06d8166a1ca58c3a1b Mon Sep 17 00:00:00 2001
From: admin <admin>
Date: Tue, 28 Sep 2021 13:38:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?=
 =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?=
 =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index e7cee0f..ec68170 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -604,6 +604,32 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("打印类型")
     private Integer printType;
 
+    @Transient
+    @ApiParam("30天以下")
+    private double thirtyDays;
+
+    @Transient
+    @ApiParam("30-60天")
+    private double thirtyToSixtyDays;
+
+    @Transient
+    @ApiParam("60-90天")
+    private double sixtyToNinetyDays;
+
+    @Transient
+    @ApiParam("90天以上")
+    private double morhanDays;
+
+    public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) {
+        this.zoneNo=zoneNo;
+        this.lotNo=lotNo;
+        this.partNo=partNo;
+        this.thirtyDays = thirtyDays;
+        this.thirtyToSixtyDays = thirtyToSixtyDays;
+        this.sixtyToNinetyDays = sixtyToNinetyDays;
+        this.morhanDays = morhanDays;
+    }
+
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
         this.sn = sn;

From e4ee9c5ce5c675e012ab848514f82c9d71147e75 Mon Sep 17 00:00:00 2001
From: admin <admin>
Date: Tue, 28 Sep 2021 13:48:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?=
 =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?=
 =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index e7cee0f..7cc1a9a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -604,6 +604,32 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("打印类型")
     private Integer printType;
 
+    @Transient
+    @ApiParam("30天以下")
+    private double thirtyDays;
+
+    @Transient
+    @ApiParam("30-60天")
+    private double thirtyToSixtyDays;
+
+    @Transient
+    @ApiParam("60-90天")
+    private double sixtyToNinetyDays;
+
+    @Transient
+    @ApiParam("90以上天")
+    private double morhanDays;
+
+    public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) {
+        this.zoneNo=zoneNo;
+        this.lotNo=lotNo;
+        this.partNo=partNo;
+        this.thirtyDays = thirtyDays;
+        this.thirtyToSixtyDays = thirtyToSixtyDays;
+        this.sixtyToNinetyDays = sixtyToNinetyDays;
+        this.morhanDays = morhanDays;
+    }
+
     public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
                       String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
         this.sn = sn;

From 685166caf7cbe14ff5c1e7941e36331726d93408 Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Tue, 28 Sep 2021 20:20:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E6=9E=9A=E4=B8=BEOUT=5FM?=
 =?UTF-8?q?OVEMENT=5FBUSI=5FTYPE=20=E6=96=B0=E5=A2=9E=20=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=A1=A5=E8=B4=A7?=
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  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d3613aa..3e95368 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
@@ -881,7 +881,8 @@ public class WmsEnumUtil {
         SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
         COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR
         PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"),
-        SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR
+        SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库"),//默认DMR
+        SAFE_RESERVE(800, "SAFE_RESERVE", "安全库存补货");//默认DMR
 
         private int value;
         private String code;