From d731205471b42f77aa98bda2fd3a3a4a84bbce82 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 23 May 2025 19:14:36 +0800 Subject: [PATCH] =?UTF-8?q?47122=20PCN-=E6=88=90=E9=83=BD=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=89=93=E5=8D=B0=E5=8A=A0=E8=BD=BD=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/ChengDuVolvoShippingPrintStrategyService.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java index a44364d..e6be5f7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java @@ -33,6 +33,7 @@ import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @Description : 成都volvo发运单打印策略 @@ -196,15 +197,12 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat detailModel.setPartNo(detail.getPartNo()); detailModel.setPartName(detail.getPartName()); detailModel.setCustPartNo(detail.getCustPartNo()); - if (!StringUtils.isEmpty(detail.getPartPosition())) { - String tmpPosition = detail.getPartPosition().substring(detail.getPartPosition().length() - 2); - StringBuilder splitPosition = new StringBuilder(); - for (char c : tmpPosition.toCharArray()) { - if (Character.isDigit(c)) { - splitPosition.append(c); + if (detail.getSourceId() != null) { + for (MesCimVolvoJisRackIdDetail rackIdDetail : rackIdDetails) { + if (Objects.equals(detail.getSourceId(), rackIdDetail.getId())) { + detailModel.setPartPosition(rackIdDetail.getPosition()); } } - detailModel.setPartPosition(splitPosition.toString()); } detailModels.add(detailModel); }