Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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;

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;