From f7f0ebadaf5582c4f2ba30c1127d4966bd5368ac Mon Sep 17 00:00:00 2001
From: shiyanghuan <714967695@qq.com>
Date: Fri, 21 Jun 2019 15:16:14 +0800
Subject: [PATCH 1/2] Merge branch 'dev' of
 http://git.estsh.com/i3-WMS/i3plus-wms into dev

# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java
---
 .../pojo/wms/repository/WmsVendorPartRepository.java     |  2 ++
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
index be3972b..f8d418a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
 }
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 2413009..49caa41 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
@@ -1941,4 +1941,20 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 单位定义
+     *
+     * @param wmsUnit
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
+        getStringBuilderPack(wmsUnit, result);
+
+        return result;
+    }
 }

From 0182dd3cc3e7ab4cebecb87bc01d4940a0a56162 Mon Sep 17 00:00:00 2001
From: "sky.meng" <sky.meng@estsh.com>
Date: Fri, 21 Jun 2019 16:40:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF(=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=BF=83)=20=E5=AD=98=E5=82=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java
index a5b785e..87ad548 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.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 : 工作中心线边库区关系
@@ -35,4 +36,12 @@ public class WmsWorkCenterZone extends BaseBean {
     @Column(name = "ZONE_NO")
     @ApiParam(value = "线边库区")
     private String zoneNo;
+
+    @Transient
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Transient
+    @ApiParam("线边库区名称")
+    private String zoneName;
 }