From bb811306ffde6ee16f80491a2723f5411d30b68d Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Mon, 29 Apr 2019 10:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20wmsShopping=20=E4=B8=BA=20?=
 =?UTF-8?q?wmsShipping?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/bean/{WmsShopping.java => WmsShipping.java}    |  2 +-
 .../pojo/wms/repository/WmsShoppingRepository.java     |  4 ++--
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/{WmsShopping.java => WmsShipping.java} (97%)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java
similarity index 97%
rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java
index 9d87af8..c777851 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java
@@ -28,7 +28,7 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_SHIPPING")
 @Api("产品发运信息")
-public class WmsShopping extends BaseBean {
+public class WmsShipping extends BaseBean {
 
     @Column(name="ORDER_NO")
     @ApiParam("发运单号")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java
index e6e6250..2d3bf04 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java
@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsShopping;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShipping;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsShoppingRepository extends BaseRepository<WmsShopping, Long> {
+public interface WmsShoppingRepository extends BaseRepository<WmsShipping, 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 c95477d..615e686 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
@@ -595,26 +595,26 @@ public class WmsHqlPack {
     /**
      * 产品发运信息 查询条件封装
      *
-     * @param wmsShopping
+     * @param wmsShipping
      * @return
      */
-    public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) {
+    public static DdlPackBean packHqlWmsShipping(WmsShipping wmsShipping) {
         DdlPackBean result = new DdlPackBean();
 
         //发运单号
-        DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShipping.getOrderNo(), "orderNo", result);
         //客户编码
-        DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getCustNo(), "custNo", result);
         //物料编码
-        DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getPartNo(), "partNo", result);
         //条码
-        DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
         //发运状态
-        DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
         //特殊发货标志
-        DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
 
-        getStringBuilderPack(wmsShopping, result);
+        getStringBuilderPack(wmsShipping, result);
 
         return result;
     }