From 2b62357ab57443969b26654a28903d6525dd7a2b Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 8 Oct 2019 17:40:15 +0800
Subject: [PATCH] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=E3=80=90=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B71051?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 13 ++++++--
 .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java |  4 +++
 .../pojo/wms/engine/rule/GenerateSnRule.java       |  5 +++
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 36 +++++++++++++++++-----
 4 files changed, 48 insertions(+), 10 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 e01b83b..9e9f331 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
@@ -3579,6 +3579,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static PART_ASSOCIATE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -3635,8 +3644,8 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-    
-    
+
+
     /**
      * 物流规则 处理模式
      */
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index fa09e20..82bfeeb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
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
index 6432f58..5ed6569 100644
--- 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
@@ -42,4 +42,9 @@ public class GenerateSnRule {
      * 库位来源
      */
     private Integer locateSource;
+
+    /**
+     * 是否允许生成二维码
+     */
+    private Integer isSn2d;
 }
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 b6cafeb..88dc044 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
@@ -2376,9 +2376,9 @@ public class WmsHqlPack {
 
         return result;
     }
-    
-    
-    
+
+
+
     /**
      * 业务：库存查询封装
      *
@@ -2388,24 +2388,44 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRouting, result);
 
         return result;
     }
-    
+
     public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
         DdlPackBean result = new DdlPackBean();
 
-     
+
         DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
 //        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
-  
+
         getStringBuilderPack(wmsRoutingRule, result);
 
         return result;
     }
+
+    /**
+     * 物料关系查询条件封装
+     *
+     * @param wmsPartRelation
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartRelation(WmsPartRelation wmsPartRelation) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringRightLikerPack(wmsPartRelation.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getPartName(), "partName", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateCode(), "associateCoded", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateNameAdd(), "associateNameAdd", result);
+        DdlPreparedPack.getNumEqualPack(wmsPartRelation.getAssociateType(), "associateType", result);
+
+        getStringBuilderPack(wmsPartRelation, result);
+
+        return result;
+    }
 }