完善报表查询条件

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

@@ -45,7 +45,9 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         dataQueryHql.append("mes_production_assembly.createUser AS createUser,");
         dataQueryHql.append("mes_production_record.workOrderNo AS workOrderNo,");
         dataQueryHql.append("mes_production_record.lotNo AS lotNo,");
-        dataQueryHql.append("mes_equipment.equipmentName AS equipmentName)");
+        dataQueryHql.append("mes_equipment.equipmentName AS equipmentName,");
+        dataQueryHql.append("mes_equipment.equipId AS equipId ");
+        dataQueryHql.append(") ");
 
         StringBuilder countQueryHql= new StringBuilder();
         countQueryHql.append("select count(1)");
@@ -69,8 +71,8 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
             commonQueryHql.append("AND mes_production_assembly.serialNumber like :serialNumber ");
         }
         // = 装配件条码确认规则
-        if (model.getMatchType()!=null){
+        if (!StringUtils.isEmpty(model.getMatchRule())){
-            commonQueryHql.append("AND mes_production_assembly.matchType = :matchType ");
+            commonQueryHql.append("AND mes_production_assembly.matchRule = :matchRule ");
         }
         // like 零件号
         if(!StringUtils.isEmpty(model.getPartNo())){
@@ -112,10 +114,9 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         if(!StringUtils.isEmpty(model.getWorkCellCode())){
             commonQueryHql.append("AND mes_production_assembly.workCellCode like :workCellCode ");
         }
-        //= 扫描类型
+        if (model.getMatchType()!=null){
-//        if (!StringUtils.isEmpty(model.getScanType())){
+            commonQueryHql.append("AND mes_production_assembly.matchRule = :matchRule ");
-//            commonQueryHql.append("AND mes_production_assembly.scanType = :scanType ");
+        }
-//        }
         //like 加工单号
         if(!StringUtils.isEmpty(model.getWorkOrderNo())){
             commonQueryHql.append("AND mes_production_record.workOrderNo like :workOrderNo ");
@@ -124,6 +125,9 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         if(!StringUtils.isEmpty(model.getEquipmentName())){
             commonQueryHql.append("AND mes_equipment.equipmentName like :equipmentName ");
         }
+        if (model.getEquipId()!=null){
+            commonQueryHql.append("AND mes_equipment.equipId = :equipId ");
+        }
         commonQueryHql.append("ORDER BY mes_production_assembly.createDatetime DESC ");
 
         Query dataQuery = entityManager.createQuery(dataQueryHql.append(commonQueryHql).toString(), AssemblyPartReportModel.class);
@@ -182,11 +186,17 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         if(!StringUtils.isEmpty(model.getWorkCellCode())){
             dataQuery.setParameter("workCellCode", model.getWorkCellCode() + "%");
         }
+        if (model.getMatchType()!=null){
+            dataQuery.setParameter("matchRule", model.getMatchRule());
+        }
         if(!StringUtils.isEmpty(model.getWorkOrderNo())){
             dataQuery.setParameter("workOrderNo", model.getWorkOrderNo() + "%");
         }
         if(!StringUtils.isEmpty(model.getEquipmentName())){
             dataQuery.setParameter("equipmentName", model.getEquipmentName() + "%");
         }
+        if (model.getEquipId()!=null){
+            dataQuery.setParameter("equipId", model.getEquipId());
+        }
     }
 }

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

@@ -76,8 +76,8 @@ public class SuspiciousItemBarcodeReportDaoImpl implements ISuspiciousItemBarcod
             commonQueryHql.append("AND mpd.frontBack = :frontBack ");
         }
         // = nc状态
-        if(!StringUtils.isEmpty(model.getStatus())){
+        if(!StringUtils.isEmpty(model.getNcStatus())){
-            commonQueryHql.append("AND mpd.status = :status ");
+            commonQueryHql.append("AND mp.ncStatus = :ncStatus ");
         }
         // like 缺陷代码
         if(!StringUtils.isEmpty(model.getDefectTypeCode())){
@@ -144,8 +144,8 @@ public class SuspiciousItemBarcodeReportDaoImpl implements ISuspiciousItemBarcod
             query.setParameter("frontBack", model.getFrontBack());
         }
         // =nc状态
-        if(!StringUtils.isEmpty(model.getStatus())){
+        if(!StringUtils.isEmpty(model.getNcStatus())){
-            query.setParameter("status", model.getStatus());
+            query.setParameter("ncStatus", model.getNcStatus());
         }
         // like 缺陷代码
         if(!StringUtils.isEmpty(model.getDefectTypeCode())){
@@ -175,7 +175,7 @@ public class SuspiciousItemBarcodeReportDaoImpl implements ISuspiciousItemBarcod
             query.setParameter("inspectionStatus", model.getInspectionStatus());
         }
         if (!StringUtils.isEmpty(model.getShiftCode())){
-            query.setParameter("shiftCode", model.getShiftCode());
+            query.setParameter("shiftCode", model.getShiftCode()+"%");
         }
     }
 }