From b64327831a683994087e0799f5c5b74aa93a8125 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Jan 2020 18:58:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=207402=20=E6=94=B6=E8=B4=A7=E5=9B=9E?= =?UTF-8?q?=E6=89=A7=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN=E7=BB=84?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E4=B9=9F=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN=E7=BB=84?= =?UTF-8?q?=E5=8F=B7=20=E3=80=91bug7402?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index c9a988d..417c5f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -69,6 +69,10 @@ public class PrintOrderDataModel implements Serializable { @Transient public String vendorEmail; + @ApiParam(value = "集装箱号") + @Transient + public String containerNo; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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 cdf4f66..31bab21 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 @@ -231,7 +231,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); @@ -635,6 +635,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getContainerNo(), "containerNo", result); // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { @@ -2434,6 +2435,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProduct(), "forProduct", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForWareHouse(), "forWareHouse", result); + DdlPreparedPack.getNumEqualPack(wmsRouting.getForProductClass(), "forProductClass", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result);