diff --git a/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/src/main/java/com/gaotao/modules/pms/controller/QcController.java index 28f4ba1..c7ea343 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -1673,7 +1673,8 @@ public class QcController { String site = params.get("site"); //String buNo = params.get("buNo"); String orderNo = params.get("orderNo"); - int count = qcService.checkProcessInspectionPendingCount(site, orderNo); + String resourceId = params.get("resourceId"); + int count = qcService.checkProcessInspectionPendingCount(site, orderNo, resourceId); return R.ok().put("count", count); } diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java index 279fbf7..0159a94 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java @@ -466,5 +466,5 @@ public interface QcMapper { /** * 查询过程检验待检验记录数量 */ - int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo); + int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo, @Param("resourceId") String resourceId); } diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java index 9693d7c..6e91706 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java @@ -3519,8 +3519,8 @@ public class QcServiceImpl implements QcService { * 查询过程检验待检验记录数量 */ @Override - public int checkProcessInspectionPendingCount(String site, String orderNo) { - return qcMapper.checkProcessInspectionPendingCount(site, orderNo); + public int checkProcessInspectionPendingCount(String site, String orderNo, String resourceId) { + return qcMapper.checkProcessInspectionPendingCount(site, orderNo, resourceId); } } diff --git a/src/main/java/com/gaotao/modules/pms/service/QcService.java b/src/main/java/com/gaotao/modules/pms/service/QcService.java index aad95dd..e04f331 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcService.java @@ -264,5 +264,5 @@ public interface QcService { /** * 查询过程检验待检验记录数量 */ - int checkProcessInspectionPendingCount(String site, String orderNo); + int checkProcessInspectionPendingCount(String site, String orderNo, String resourceId); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 06cda4a..4aeb7d1 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -611,6 +611,9 @@ AND a.operation_desc LIKE '%' + #{query.operationDesc} + '%' + + AND a.resource_id = #{query.resourceId} + AND a.inspector_date >= #{query.startDate} @@ -3321,6 +3324,7 @@ FROM qc_ipqc_record WHERE site = #{site} AND order_no = #{orderNo} + AND resource_id = #{resourceId} AND state IN ('未开始', '待检验')