From 5dfad71e39adca3b37856ff227cc1c395bba7e6a Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Fri, 10 Jul 2020 13:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=902292=20=E5=AD=90=2007=201.2.3.6.3?=
 =?UTF-8?q?=E6=AC=A7=E6=B4=B2WMS-PCR-RFID=E5=85=A5=E5=BA=93=20=E3=80=91=20?=
 =?UTF-8?q?=E3=80=902310=2007=201.2.3.6.3=E6=AC=A7=E6=B4=B2WMS-RFID?=
 =?UTF-8?q?=E5=8F=91=E8=BF=90=E3=80=91=20=E3=80=902312=2007=201.2.3.6.3?=
 =?UTF-8?q?=E6=AC=A7=E6=B4=B2WMS-RFID=E7=A9=BA=E8=BD=A6=E5=9B=9E=E5=BA=93?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   |  6 ++++--
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java |  4 ++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java    | 10 ++++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java |  1 +
 4 files changed, 19 insertions(+), 2 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 d298220..717da76 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
@@ -515,7 +515,8 @@ public class WmsEnumUtil {
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
         TRANSIT_LOCATE(80, "T", "在途库"),
         UTENSIL_LOCATE(90, "U", "器具库"),
-        OPERATION_PALTFORM(100, "W", "工作台");
+        OPERATION_PALTFORM(100, "W", "工作台"),
+        CUST_LOCATE(110, "CUST", "客户库位");
 
         private int value;
         private String code;
@@ -2546,7 +2547,8 @@ public class WmsEnumUtil {
         BOX(10, "BOX", "BOX（盒）"),
         CARTON(20, "CARTON", "CARTON（箱）"),
         PALLET(30, "PALLET", "PALLET（栈板）"),
-        CONTAINER(40, "PALLET", "PALLET（集装箱）");
+        CONTAINER(40, "PALLET", "PALLET（集装箱）"),
+        FEEDER(50, "FEEDER", "料架");
 
         private String code;
         private String description;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 640dca1..8734084 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -227,6 +227,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "库位箱数")
     private Long qty;
 
+    @Transient
+    @ApiParam(value = "不等于库位类型")
+    private Integer notLocateType;
+
     public WmsLocate() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
index 189a4f6..31cf362 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
@@ -1,6 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,6 +38,7 @@ public class WmsPackage extends BaseBean {
     public String packageNo;
 
     @Column(name="PACKAGE_TYPE_ID")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
     @ApiParam(value = "包装类型", example = "1")
     public Integer packTypeId;
 
@@ -64,4 +69,9 @@ public class WmsPackage extends BaseBean {
     @Column(name="MEMO")
     @ApiParam(value = "备注")
     public String memo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateNo;
 }
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 4a0f756..571c9e2 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
@@ -198,6 +198,7 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
         //查询参数封装
         DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);