From 84e733abe8c74073d7e8856e5616aae6e2ac2b17 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sun, 20 Sep 2026 15:34:03 +0800 Subject: [PATCH] =?UTF-8?q?TT=E5=92=8CQMS=E6=A3=80=E9=AA=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/service/Impl/QcBaseInfoServiceImpl.java | 5 +++++ .../com/gaotao/modules/pms/service/Impl/QcServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java index 227ab51..f2ee644 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java @@ -1562,7 +1562,12 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { public List getQcSpecItemList(QcSpecData data) { SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); data.setUserName(currentUser.getUsername()); + // 前端按物料传入的 site 优先，避免组合 BU 解析后覆盖成其它工厂 + String requestSite = data.getSite(); BuResolveUtil.resolveSiteBuFromQuery(null, data.getBuNo(), data::setSite, data::setBuNo); + if (StringUtils.isNotBlank(requestSite)) { + data.setSite(requestSite); + } return qcBaseInfoMapper.getQcSpecItemList(data); } diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java index 0b49a5f..4c473d2 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java @@ -5584,7 +5584,7 @@ public class QcServiceImpl implements QcService { } switch (inspectionTypeKey.trim().toUpperCase()) { case "AOI": - return "IPQC"; + return "IPQC首件检"; case "CQC": return "OQC"; case "FQC":