merge uat-temp-pzj-250123-Assembly-Report 解决冲突

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

@@ -56,8 +56,8 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         countQueryHql.append("select count(1)");
         StringBuilder commonQueryHql = new StringBuilder();
         commonQueryHql.append("FROM MesProductionAssembly a ");
-        commonQueryHql.append("JOIN MesProductionRecord b ON a.productionRecordId = b.id AND a.organizeCode=b.organizeCode ");
+        commonQueryHql.append("JOIN MesProductionRecord b ON a.organizeCode=b.organizeCode AND a.productionRecordId = b.id ");
-        commonQueryHql.append("JOIN MesEquipment c ON b.equipmentCode = c.equipmentCode AND c.organizeCode=b.organizeCode ");
+        commonQueryHql.append("JOIN MesEquipment c ON c.organizeCode=b.organizeCode AND b.equipmentCode = c.equipmentCode ");
         commonQueryHql.append("WHERE 1=1 ");
         commonQueryHql.append("AND a.organizeCode = :organizeCode ");
         commonQueryHql.append("AND b.organizeCode = :organizeCode ");
@@ -68,6 +68,9 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         commonQueryHql.append("AND a.isValid = :isValid ");
         commonQueryHql.append("AND b.isValid = :isValid ");
         commonQueryHql.append("AND c.isValid = :isValid ");
+        if (!StringUtils.isEmpty(model.getCustSn())) {
+            commonQueryHql.append("AND a.custSn like :custSn ");
+        }
         // like 条码
         if (!StringUtils.isEmpty(model.getSerialNumber())) {
             commonQueryHql.append("AND a.serialNumber like :serialNumber ");
@@ -149,6 +152,9 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         dataQuery.setParameter("organizeCode", model.getOrganizeCode());
         dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue());
+        if (!StringUtils.isEmpty(model.getCustSn())) {
+            dataQuery.setParameter("custSn", model.getCustSn() + "%");
+        }
         if (!StringUtils.isEmpty(model.getSerialNumber())) {
             dataQuery.setParameter("serialNumber", model.getSerialNumber() + "%");
         }