diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestDetailServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestDetailServiceImpl.java index 408b3c9..ec0f214 100644 --- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestDetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestDetailServiceImpl.java @@ -33,9 +33,11 @@ public class InspectionRequestDetailServiceImpl extends ServiceImpl getMyInspectionList(MyInspectionListVO query) { // 自动设置当前登录用户为 QC 人员 SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); - if (currentUser != null) { - query.setQcOperator(currentUser.getUsername()); + if (currentUser == null || currentUser.getSite() == null || currentUser.getSite().trim().isEmpty()) { + throw new RuntimeException("当前登录工厂不能为空"); } + query.setQcOperator(currentUser.getUsername()); + query.setSite(currentUser.getSite()); return baseMapper.getMyInspectionList(new Page<>(query.getPage(), query.getLimit()), query); } } diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java index 337a1f8..fcd0aa7 100644 --- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java +++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java @@ -67,6 +67,12 @@ public class InspectionRequestServiceImpl extends ServiceImpl resultList = baseMapper.myPage(new Page<>(data.getPage(), data.getLimit()), data); return new PageUtils(resultList); } diff --git a/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java b/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java index 1b285f8..0500891 100644 --- a/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/modules/qms/service/impl/QcServiceImpl.java @@ -5475,7 +5475,7 @@ public class QcServiceImpl implements QcService { List templates = getTemplates(detail); if (templates == null || templates.isEmpty()) { - throw new RuntimeException("该供应商未维护此物料的检验模板"); + throw new RuntimeException("未维护此物料的检验模板"); } String inspectionNo = genInspectionNo(detail.getSite()); @@ -5489,7 +5489,7 @@ public class QcServiceImpl implements QcService { getTemplateDetail(template.getTemplateId(), detail.getSite(), partAttr.getBuNo(), - detail.getSupplierNo()); + "*"); if (items == null || items.isEmpty()) { continue; @@ -5521,7 +5521,7 @@ public class QcServiceImpl implements QcService { return qcMapper.listByPart( detail.getSite(), detail.getPartNo(), - detail.getSupplierNo()); + "*"); } // ================= 查询模板明细 ================= diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml index 2dc6a8c..3e15a2e 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml @@ -182,6 +182,7 @@ LEFT JOIN part p ON d.part_no = p.part_no AND d.site = p.site LEFT JOIN srm_supplier s ON h.supplier_no = s.supplier_no AND h.site = s.site + AND d.site = #{query.site} AND h.qc_operator = #{query.qcOperator}