From fe3d392e9bb565c6c79f013a0fe289e3ab9055e7 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: Thu, 4 Jul 2019 16:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A8=E5=86=97=E4=BD=99=E4=B8=BB=E8=A1=A8=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
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       | 12 +++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java     |  4 +++
 .../pojo/wms/engine/rule/GenerateSnRule.java       | 40 ++++++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java

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 457faaa..efc08fa 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
@@ -2853,4 +2853,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_SN_GENERATE_RULE {
+        SOURCE(10, "源"), TARGET(20, "目标"), NON_ASSIGNMENT(30, "不赋值");
+
+        private int value;
+        private String description;
+
+        WMS_SN_GENERATE_RULE(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;
+        }
+    }
 }
\ No newline at end of file
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 d9563fd..9c8029d 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
@@ -210,4 +210,16 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
+
+    @Transient
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+    @Transient
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码生成状态", example = "1")
+    public Integer isSn;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 61c8310..0c1b599 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -151,6 +151,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("库存水平")
     private String stockLevelStatus;
 
+    @Column(name = "IS_PROD_LOT")
+    @ApiParam(value = "是否录入生产批次", example = "1")
+    private Integer isProdLot;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java
new file mode 100644
index 0000000..8d22953
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateSnRule {
+    /**
+     * 业务类型  130
+     */
+    private Integer busiType;
+
+    /**
+     * 是否允许生成条码
+     */
+    private Integer isGenerateSn;
+
+    /**
+     * 条码状态
+     */
+    private Integer snStatus;
+
+    /**
+     * 质量状态
+     */
+    private Integer qcStatus;
+
+    /**
+     * 仓库来源
+     */
+    private Integer whSource;
+
+    /**
+     * 存储区来源
+     */
+    private Integer zoneSource;
+}