fix bug PC-发运明细报表:增加vin和条码的查询条件-44172

dev-temp-xw-202501150000-44852
臧学普 5 months ago
parent 42033f7d57
commit 2be5ccc1e4

@ -107,6 +107,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
commonQueryHql.append("AND momd.vin like :vin "); commonQueryHql.append("AND momd.vin like :vin ");
} }
if (!StringUtils.isEmpty(model.getBarCode())) {
commonQueryHql.append("AND momd.barcode like :barcode ");
}
if (!StringUtils.isEmpty(model.getShippingCode())) { if (!StringUtils.isEmpty(model.getShippingCode())) {
commonQueryHql.append("AND ms.shippingCode like :shippingCode "); commonQueryHql.append("AND ms.shippingCode like :shippingCode ");
} }
@ -161,6 +165,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
dataQuery.setParameter("vin", model.getVin() + "%"); dataQuery.setParameter("vin", model.getVin() + "%");
} }
if (!StringUtils.isEmpty(model.getBarCode())) {
dataQuery.setParameter("barcode", model.getBarCode() + "%");
}
if (!StringUtils.isEmpty(model.getShippingCode())) { if (!StringUtils.isEmpty(model.getShippingCode())) {
dataQuery.setParameter("shippingCode", model.getShippingCode() + "%"); dataQuery.setParameter("shippingCode", model.getShippingCode() + "%");
} }

Loading…
Cancel
Save