From 193c4a254cfc952863eacb9a87a1bf4b649be466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Mon, 11 Jan 2021 16:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9013608=2020027-BI-=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=A7=E7=BA=BF-=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=87=BA=E5=BA=93=E4=B8=8EBP=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E5=AF=B9=E6=AF=94-2021-01-15=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 45 ++++++++++++++++++++++
 .../i3plus/pojo/mes/bean/IfDeliverOrderData.java   |  4 ++
 .../i3plus/pojo/mes/model/LogisticsBiModel.java    |  6 +++
 3 files changed, 55 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 12e6d71..ea8bfa9 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -8243,4 +8243,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DELIVER_ORDER_MOVE_TYPE {
+        SHIPING(10, "发运"),
+        ALLOCATION(20, "发运&调拨");
+
+        private int value;
+        private String description;
+
+        DELIVER_ORDER_MOVE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java
index 5b8ad38..7b8c9ff 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java
@@ -48,6 +48,10 @@ public class IfDeliverOrderData extends BaseBean implements Serializable {
     @ApiParam("发运数量")
     private Integer qty = 0;
 
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    private Integer moveType;
+
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java
index b267f7f..b3105ce 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java
@@ -27,4 +27,10 @@ public class LogisticsBiModel implements Serializable {
 
     @ApiParam(value = "月份")
     private Integer month;
+
+    @ApiParam(value = "实际出库数量")
+    private double outQty = 0;
+
+    @ApiParam(value = "BP总数")
+    private double bpQty= 0;
 }