From 2be5ccc1e4ea11ac05f66a10226ba103e76963e8 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 24 Dec 2024 08:26:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20bug=20PC-=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0vin?= =?UTF-8?q?=E5=92=8C=E6=9D=A1=E7=A0=81=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6-44172?= 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() + "%"); } From 49c072cc44cd7855c8dc9f1e516d0b68e86c89b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Dec 2024 14:32:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=2044615=20=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=8F=91=E8=BF=90=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoimpl/report/ShipmentDetailReportDaoImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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..03ec002 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 @@ -106,7 +106,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { commonQueryHql.append("AND momd.vin like :vin "); } - + if (!StringUtils.isEmpty(model.getCustOrderNo())) { + commonQueryHql.append("AND momd.custOrderNo like :custOrderNo "); + } if (!StringUtils.isEmpty(model.getShippingCode())) { commonQueryHql.append("AND ms.shippingCode like :shippingCode "); } @@ -122,6 +124,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getCustCode())) { commonQueryHql.append("AND ms.custCode like :custCode "); } + if (!StringUtils.isEmpty(model.getShippingGroupName())) { + commonQueryHql.append("AND ms.shippingGroupName like :shippingGroupName "); + } if (!StringUtils.isEmpty(model.getCustOrganizeCode())) { commonQueryHql.append("AND ms.custOrganizeCode = :custOrganizeCode "); } @@ -160,7 +165,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { dataQuery.setParameter("vin", model.getVin() + "%"); } - + if (!StringUtils.isEmpty(model.getShippingCode())) { + dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%"); + } if (!StringUtils.isEmpty(model.getShippingCode())) { dataQuery.setParameter("shippingCode", model.getShippingCode() + "%"); } @@ -176,6 +183,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getCustCode())) { dataQuery.setParameter("custCode", model.getCustCode() + "%"); } + if (!StringUtils.isEmpty(model.getShippingGroupName())) { + dataQuery.setParameter("shippingGroupName", "%" + model.getShippingGroupName() + "%"); + } if (!StringUtils.isEmpty(model.getCustOrganizeCode())) { dataQuery.setParameter("custOrganizeCode", model.getCustOrganizeCode()); } From fada3121131374e83c3c2638d350dfcfbd32012d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Dec 2024 14:52:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=2044615=20=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=8F=91=E8=BF=90=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 03ec002..1a9eee8 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 @@ -165,7 +165,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { dataQuery.setParameter("vin", model.getVin() + "%"); } - if (!StringUtils.isEmpty(model.getShippingCode())) { + if (!StringUtils.isEmpty(model.getCustOrderNo())) { dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%"); } if (!StringUtils.isEmpty(model.getShippingCode())) {