From eb3a8975d04dc96b59caa5bb8dc9b5239d4b7347 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 18 Nov 2026 23:03:13 -0800 Subject: [PATCH] =?UTF-8?q?oqc=E5=BC=80=E5=A7=8B=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=9C=AA=E5=87=BA=E7=8E=B0=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 5 +++ .../gaotao/modules/pms/mapper/QcMapper.java | 2 +- .../pms/service/Impl/QcServiceImpl.java | 37 +++++++++++++------ .../gaotao/modules/pms/service/QcService.java | 2 + 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java index 99d6e2a..e9b1236 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -2155,6 +2155,11 @@ public class QcController { return R.ok(); } + @PostMapping("/getOQCItemObjectList") + public R getOQCItemObjectList(@RequestBody QcFAIRecordData data) { + return R.ok().put("rows", qcService.getOQCItemObjectList(data)); + } + /** * 更改检验方式 */ diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java index 3f5c11b..464fa7e 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java @@ -629,7 +629,7 @@ public interface QcMapper { QcFAIRecordData getFQASRecordStatus(QcFAIRecordData data); - void actionFQASInspection(QcFAIRecordData data); + int actionFQASInspection(QcFAIRecordData data); void updateSamplingQty(QcFAIRecordData headerData); 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 0611242..960def5 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 @@ -3799,17 +3799,28 @@ public class QcServiceImpl implements QcService { */ @Override public List getFQCItemObjectList(EamObjectInData data) { - List itemList = qcMapper.getFQCInspectionDetail(data); - for (EamObjectInData eamObjectInData : itemList) { - List list = qcMapper.getObjectList2(eamObjectInData); - List list2 = list.stream().filter(a -> "Y".equals(a.getDefaultFlag())).collect(Collectors.toList()); - if (!list2.isEmpty()) { - eamObjectInData.setEquipmentNo(list2.get(0).getObjectID()); + return getStartInspectionItemEquipment(qcMapper.getFQCInspectionDetail(data)); + } + + @Override + public List getOQCItemObjectList(QcFAIRecordData data) { + data.setFlag("oqc"); + return getStartInspectionItemEquipment(qcMapper.listInspectionAcquisitionItems(data)); + } + + private List getStartInspectionItemEquipment(List items) { + List itemsWithEquipment = new ArrayList<>(); + for (EamObjectInData item : items) { + List equipment = qcMapper.getObjectList2(item); + if (equipment.isEmpty()) { + continue; } - eamObjectInData.setObjectList(list); + equipment.stream().filter(option -> "Y".equals(option.getDefaultFlag())).findFirst() + .ifPresent(option -> item.setEquipmentNo(option.getObjectID())); + item.setObjectList(equipment); + itemsWithEquipment.add(item); } - List collect = itemList.stream().filter(a -> !a.getObjectList().isEmpty()).collect(Collectors.toList()); - return collect; + return itemsWithEquipment; } /** @@ -5221,11 +5232,13 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void actionFQASInspection(QcFAIRecordData data) { - QcFAIRecordData currentRecord = qcMapper.getFQASRecordStatus(data); - if (currentRecord == null || !"未开始".equals(currentRecord.getState()) || "Y".equals(currentRecord.getSubmitFlag())) { + if (qcMapper.actionFQASInspection(data) == 0) { throw new RuntimeException(pmsI18nHelper.text("pms.error.inspection.status.noStart", null, "该检验单当前状态不允许开始检验,请刷新页面后重试!")); } - qcMapper.actionFQASInspection(data); + if (data.getEquipmentCollectList() != null && !data.getEquipmentCollectList().isEmpty()) { + data.setFlag("oqc"); + saveInspectionAcquisitionEquipment(data); + } } /** diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java index a34e427..22cfca0 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java @@ -356,6 +356,8 @@ public interface QcService { void actionFQASInspection(QcFAIRecordData data); + List getOQCItemObjectList(QcFAIRecordData data); + void changeInspectionWay(QcFAIRecordData data); List getOperatorList(EamAdminData data);