From e4d957523fcf7eca002f214fbc5d17ddf9c3aa08 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 23 May 2025 10:28:38 +0800 Subject: [PATCH 1/4] =?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 --- .../ChengDuVolvoShippingPrintStrategyService.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 c48e243..295f9bb 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 @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackId; import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackIdDetail; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail; +import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintDetailModel; import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintModel; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository; @@ -189,6 +190,24 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat model.setProcess("LDJIS"); model.setDate("P" + (StringUtils.isEmpty(productionDate) ? "" : productionDate.substring(2, 8))); + List detailModels = new ArrayList<>(); + for (MesShippingOrderManagementDetail detail : shippingDetails) { + ChengDuVolvoShippingPrintDetailModel detailModel = new ChengDuVolvoShippingPrintDetailModel(); + 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); + } + } + detailModel.setPartPosition(splitPosition.toString()); + } + } + model.setDetails(detailModels); return model; } } From 083baffc931dea1266ea43e0af09d222397f0332 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 23 May 2025 10:28:38 +0800 Subject: [PATCH 2/4] =?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 --- .../ChengDuVolvoShippingPrintStrategyService.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 c48e243..a44364d 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 @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackId; import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackIdDetail; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail; +import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintDetailModel; import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintModel; import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository; import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository; @@ -189,6 +190,25 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat model.setProcess("LDJIS"); model.setDate("P" + (StringUtils.isEmpty(productionDate) ? "" : productionDate.substring(2, 8))); + List detailModels = new ArrayList<>(); + for (MesShippingOrderManagementDetail detail : shippingDetails) { + ChengDuVolvoShippingPrintDetailModel detailModel = new ChengDuVolvoShippingPrintDetailModel(); + 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); + } + } + detailModel.setPartPosition(splitPosition.toString()); + } + detailModels.add(detailModel); + } + model.setDetails(detailModels); return model; } } From d731205471b42f77aa98bda2fd3a3a4a84bbce82 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 23 May 2025 19:14:36 +0800 Subject: [PATCH 3/4] =?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); } From b268c7804e70180b9297927890f5cd93069b13ff Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 26 May 2025 14:11:55 +0800 Subject: [PATCH 4/4] =?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=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E4=BD=8D=E7=BD=AE=E5=8F=B7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java | 2 ++ 1 file changed, 2 insertions(+) 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 e6be5f7..6febc4f 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 @@ -32,6 +32,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Objects; @@ -204,6 +205,7 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat } } } + detailModels.sort(Comparator.comparing(ChengDuVolvoShippingPrintDetailModel::getPartPosition)); detailModels.add(detailModel); } model.setDetails(detailModels);