From 3ee557b0c048a2f62027d382bbe0f95c3487a118 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 24 Sep 2024 19:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E5=B7=A5=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=98=9F=E5=88=97=E5=92=8C=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/roundness/MesPackageRoundnessService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java index 0a26508..6714421 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java @@ -462,7 +462,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { workOrderAssemblyRao.saveAll(assemblyList); List cellCodeList = assemblyList.stream().map(MesWorkOrderAssembly::getWorkCellCode).distinct().collect(Collectors.toList()); - Map cell2Process = assemblyList.stream().collect(Collectors.toMap(MesWorkOrderAssembly::getWorkCellCode, MesWorkOrderAssembly::getProcessSeq)); + Map> cellCodeMap = assemblyList.stream().collect(Collectors.groupingBy(MesWorkOrderAssembly::getWorkCellCode)); for (String cellCode : cellCodeList) { MesQueueOrder mesQueueOrder = new MesQueueOrder(); mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); @@ -470,7 +470,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy { mesQueueOrder.setWorkCellCode(cellCode); mesQueueOrder.setPartProdGroupCode(partProdGroup.getPartProdGroupCode()); mesQueueOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName()); - mesQueueOrder.setProcessSeq(cell2Process.get(cellCode)); + mesQueueOrder.setProcessSeq(cellCodeMap.get(cellCode).get(0).getProcessSeq()); mesQueueOrder.setPartNo(mesWorkOrder.getPartNo()); mesQueueOrder.setPartName(mesWorkOrder.getPartName()); mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());