Merge branch 'dev-temp-castle-241223-44172' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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