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);