merge dev-temp-castle-241223-44172 解决冲突

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -109,6 +109,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustOrderNo())) {
             commonQueryHql.append("AND momd.custOrderNo like :custOrderNo ");
         }
+        if (!StringUtils.isEmpty(model.getBarCode())) {
+            commonQueryHql.append("AND momd.barcode like :barcode ");
+        }
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             commonQueryHql.append("AND ms.shippingCode like :shippingCode ");
         }
@@ -168,6 +171,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustOrderNo())) {
             dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%");
         }
+        if (!StringUtils.isEmpty(model.getBarCode())) {
+            dataQuery.setParameter("barcode", model.getBarCode() + "%");
+        }
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             dataQuery.setParameter("shippingCode", model.getShippingCode() + "%");
         }