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