From 25893a29b59dac257cac804c340b7e34d5e64e4c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 30 Dec 2024 14:58:19 +0800 Subject: [PATCH] =?UTF-8?q?44643=20=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java index 0b4aec6..71f11f6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java @@ -107,6 +107,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { commonQueryHql.append("AND momd.vin like :vin "); } + if (!StringUtils.isEmpty(model.getBarCode())) { + commonQueryHql.append("AND momd.barcode like :barcode "); + } + if (!StringUtils.isEmpty(model.getShippingCode())) { commonQueryHql.append("AND ms.shippingCode like :shippingCode "); } @@ -161,6 +165,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { dataQuery.setParameter("vin", model.getVin() + "%"); } + if (!StringUtils.isEmpty(model.getBarCode())) { + dataQuery.setParameter("barcode", model.getBarCode() + "%"); + } + if (!StringUtils.isEmpty(model.getShippingCode())) { dataQuery.setParameter("shippingCode", model.getShippingCode() + "%"); }