From 01d3eeea51821307e8cdb6a3216ac326f52130f5 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 15 Apr 2020 10:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8F=91=E5=BE=80=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     |  6 ++--
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java |  5 ++++
 .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java  |  4 +--
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 32 +++++++++++++++++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

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 48058dc..ecb1651 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
@@ -6048,14 +6048,14 @@ public class WmsEnumUtil {
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PART_RECEIVING_TYPE {
+    public enum PART_RECEIVING_METHOD {
         STAND(10, "标准收货"),
         PREPARE(20, "预收货");
 
         private int value;
         private String description;
 
-        PART_RECEIVING_TYPE(int value, String description) {
+        PART_RECEIVING_METHOD(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -6068,7 +6068,7 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public static PART_RECEIVING_TYPE codeOf(int value) {
+        public static PART_RECEIVING_METHOD codeOf(int value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
                     return values()[i];
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
index c87d03b..a33715f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@@ -112,6 +112,11 @@ public class WmsBom extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String terminalNo;
 
+    @Column(name = "NEW_BOM_VERSION")
+    @ApiParam(value = "新版本号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String newBomVersion;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java
index 8076e5a..e01c45c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java
@@ -134,8 +134,8 @@ public class WmsPartExtend extends BaseBean {
 
     @Column(name = "RECEIVING_MODE")
     @ApiParam(value = "收货方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_TYPE")
-    private Integer receivingMode;
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD")
+    private Integer receivingMethod;
 
     @Column(name = "PRE_RECEIVING_DAY")
     @ApiParam(value = "预收货天数")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index fb7dc06..131c0f9 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -2275,7 +2275,7 @@ public class WmsHqlPack {
     /**
      * 供应商窗口时间 条件封装
      *
-     * @param subPart
+     * @param vendorWindow
      * @return
      */
     public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) {
@@ -2288,6 +2288,36 @@ public class WmsHqlPack {
     }
 
     /**
+     * 供应商窗口时间 条件封装
+     *
+     * @param custWindow
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCustWindow(WmsCustWindow custWindow) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(custWindow.getCustNo(), "custNo", packBean);
+        getStringBuilderPack(custWindow, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 客户物料发往地 条件封装
+     *
+     * @param shipping
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCustomerPartShipping(WmsCustomerPartShipping shipping) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(shipping.getCustomerCode(), "customerCode", packBean);
+        getStringBuilderPack(shipping, packBean);
+
+        return packBean;
+    }
+
+    /**
      * 供应商父子关系 条件封装
      *
      * @param vendorPlanner