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() + "%"); }