From 22eaa30dab0538d8a747b065b5bc3c687813b775 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 20 Jan 2020 18:52:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=B6=E8=B4=A7=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=A4=9A=E6=94=B6=E4=BA=86=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=89=AB=E6=8F=8F=E5=8D=95=E5=8F=B7=EF=BC=8C=E8=AF=A5?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E6=98=8E=E7=BB=86=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=E3=80=82=E3=80=91=E3=80=90bug7423=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/form/WmsPackageModel.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java new file mode 100644 index 0000000..c9c9845 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : qianHuaSheng + * @CreateDate : 2019-06-06 15:40 + * @Modify: + **/ +@Data +public class WmsPackageModel { + + List wmsPackageList; + +} 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 8c32ae6..b50ab64 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 @@ -186,9 +186,10 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean); DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); - DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo()==null?"":wmsPackage.getPocketNo()+"%", "pocketNo", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);