Merge branch 'uat-temp-wj-2412300000-44615' into test

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

@@ -106,7 +106,12 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getVin())) {
             commonQueryHql.append("AND momd.vin like :vin ");
         }
-
+        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 ");
         }
@@ -122,6 +127,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             commonQueryHql.append("AND ms.custCode like :custCode ");
         }
+        if (!StringUtils.isEmpty(model.getShippingGroupName())) {
+            commonQueryHql.append("AND ms.shippingGroupName like :shippingGroupName ");
+        }
         if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
             commonQueryHql.append("AND ms.custOrganizeCode = :custOrganizeCode ");
         }
@@ -160,7 +168,12 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getVin())) {
             dataQuery.setParameter("vin", model.getVin() + "%");
         }
-
+        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() + "%");
         }
@@ -176,6 +189,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             dataQuery.setParameter("custCode", model.getCustCode() + "%");
         }
+        if (!StringUtils.isEmpty(model.getShippingGroupName())) {
+            dataQuery.setParameter("shippingGroupName", "%" + model.getShippingGroupName() + "%");
+        }
         if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
             dataQuery.setParameter("custOrganizeCode", model.getCustOrganizeCode());
         }