From 4fad1795b108eeed26fa8e8cd373bb2c56975886 Mon Sep 17 00:00:00 2001
From: shiyanghuan <714967695@qq.com>
Date: Wed, 19 Jun 2019 17:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java |  5 +++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 10 ++++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java |  1 +
 3 files changed, 16 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
index 271275b..a4b9feb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库位物料表
@@ -56,6 +57,10 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
+    @Transient
+    @ApiParam("库位类型")
+    private Integer locateType;
+
     public Double getMin() {
         return this.min == null ? 0 : this.min;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java
index 5f4e250..fd123b1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 供应商零件关系
@@ -36,4 +37,13 @@ public class WmsVendorPart extends BaseBean {
     @ApiParam(value = "物料号")
     private String partNo;
 
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String vendorName;
 }
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 fdf44c1..0b75c12 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
@@ -438,6 +438,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
+        //DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateType().toString(), "locateType", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);