From f5dee63b21106556ba2c7003b2afd617fa4e6575 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Tue, 6 Jul 2021 17:24:19 +0800
Subject: [PATCH] =?UTF-8?q?3579=2020063-=E7=B2=BE=E5=86=B2=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E7=9C=8B=E6=9D=BF-202107?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java  | 26 ++++++++++
 .../wms/dto/WmsFinePunchWarehouseWarningDto.java   | 58 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java   | 14 ++++++
 3 files changed, 98 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
index 0a500ac..c493171 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@@ -67,6 +67,11 @@ public class WmsLocatePart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
     private Double max;
 
+    @Column(name = "WARN", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "预警值", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double warn;
+
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最小值", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
@@ -127,6 +132,10 @@ public class WmsLocatePart extends BaseBean {
         return this.max ==null?0:this.max.doubleValue();
     }
 
+    public double getWarnValue() {
+        return this.warn ==null?0:this.warn.doubleValue();
+    }
+
     public double getMinValue(){
         return this.min ==null?0:this.min.doubleValue();
     }
@@ -153,4 +162,21 @@ public class WmsLocatePart extends BaseBean {
         this.whNo = whNo;
         this.stockUnit = stockUnit;
     }
+
+    public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double warn, Double min,
+                         Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, String stockUnit) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.pullQty = pullQty;
+        this.max = max;
+        this.warn = warn;
+        this.min = min;
+        this.isGeneratePicklist = isGeneratePicklist;
+        this.safetyStock = safetyStock;
+        this.moq = moq;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.stockUnit = stockUnit;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java
new file mode 100644
index 0000000..a4f7dfb
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsFinePunchWarehouseWarningDto.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WmsFinePunchWarehouseWarningDto
+ * @Author :gsz
+ * @Date 2021/7/5 11:03
+ * @Modify
+ **/
+@Data
+@Api("中航WMS看板－精冲库存预警看板(出参)")
+public class WmsFinePunchWarehouseWarningDto {
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件号名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "库存地")
+    private String areaNo;
+
+    @ApiParam(value = "库存数")
+    private Double qty;
+
+    @ApiParam(value = "最大库存值")
+    private Double maxqty;
+
+    @ApiParam(value = "预警值")
+    private Double warnValue;
+
+    @ApiParam(value = "最小库存值")
+    private Double minqty;
+
+    @ApiParam(value = "库存状态")
+    private String stockStatus;
+
+    @ApiParam(value = "颜色")
+    private String color;
+
+    public WmsFinePunchWarehouseWarningDto(String partNo, String partNameRdd, String areaNo, Double qty, Double maxqty, Double warnValue, Double minqty, String stockStatus, String color) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.areaNo = areaNo;
+        this.qty = qty;
+        this.maxqty = maxqty;
+        this.warnValue = warnValue;
+        this.minqty = minqty;
+        this.stockStatus = stockStatus;
+        this.color = color;
+    }
+
+    public WmsFinePunchWarehouseWarningDto() {
+    }
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
index ba061d6..5e1a1cd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
@@ -44,6 +44,9 @@ public class WmsStockSnDto {
     @ApiParam(value = "存储区")
     private String zoneNo;
 
+    @ApiParam(value = "库存地代码")
+    private String areaNo;
+
     public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) {
         this.locateNo = locateNo;
         this.partNo = partNo;
@@ -71,6 +74,17 @@ public class WmsStockSnDto {
         this.zoneNo = zoneNo;
     }
 
+    public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo, String areaNo) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.dateCode = dateCode;
+        this.partSpec = partSpec;
+        this.zoneNo = zoneNo;
+        this.areaNo = areaNo;
+    }
+
     public WmsStockSnDto() {
     }
 }