From ecdd1d45debcc95a6ea123c396a420e37e927b7a Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Mon, 1 Apr 2019 19:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=95=A3=E4=BB=B6=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 34 ++++++++++++++++++++++
 .../pojo/wms/bean/WmsDocMovementDetails.java       | 10 +++++++
 2 files changed, 44 insertions(+)

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 bf6d6ea..afc39d4 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
@@ -1987,4 +1987,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 单据是否散件
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_PART {
+        IS_ADJUST(1, "散件"), ADJUST(2, "非散件");
+
+        private int value;
+        private String description;
+
+        IS_PART(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
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 eeeff68..2639206 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
@@ -145,6 +145,10 @@ public class WmsDocMovementDetails extends BaseBean {
     private String actualLot;
 
     @Transient
+    @ApiParam("实际数量")
+    private Double actualQty;
+
+    @Transient
     @ApiParam("推荐批次")
     private String recommondLot;
 
@@ -152,5 +156,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("推荐库位")
     private String recommondLocateNo;
 
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    private Boolean isSet = false;
+
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+
+    public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
 }