From bc19ea5040a356e5bc95c093ec0ded8be13a5bcd Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 8 Apr 2024 20:07:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=8C=89=E8=AE=A2=E5=8D=95=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/InComingDTO.java | 2 ++ .../mapper/TrunklineAdvanceMapper.xml | 5 ++++- .../service/impl/InComingServiceImpl.java | 18 ++++++++++++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java index e256a40ca..9f567b977 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java @@ -24,4 +24,6 @@ public class InComingDTO implements Serializable { private List advanceIds;//暂存单ids + private List orderCodes; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index 2d57ab2c1..2088d1d15 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -146,7 +146,10 @@ and lta.train_number = #{param.incomingCode} - and lta.order_code = #{param.incomingCode} + and lta.order_code in + + #{item} + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index 0ce05c922..36b3f69f2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -19,10 +19,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Slf4j @Service @@ -126,6 +123,19 @@ public class InComingServiceImpl implements IInComingService { @Override public R findIncomingOrderList(InComingDTO inComingDTO) { + Integer incomingType = inComingDTO.getIncomingType(); + if(incomingType == 5){ + String incomingCode = inComingDTO.getIncomingCode(); + incomingCode = incomingCode.replaceAll("，",","); + List orderCodes = new ArrayList<>(); + if(incomingCode.contains(",")){ + orderCodes.addAll(Arrays.asList(incomingCode.split(","))); + }else{ + orderCodes.add(incomingCode); + } + inComingDTO.setOrderCodes(orderCodes); + } + List ls = advanceService.findIncomingOrderList(inComingDTO); for (TrunklineAdvanceVO advanceVO : ls) { Long advanceId = advanceVO.getId(); From 06993827adf87da1ea3d179ebed88caf8cda70dc Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 8 Apr 2024 21:09:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=8C=89=E8=AE=A2=E5=8D=95=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/patch/service/impl/SyncOrderInfoServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 684a11c4b..fbc80607a 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1643,7 +1643,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); if(!Objects.isNull(waybillEntity)){ String warehouseName = waybillEntity.getWarehouseName();//目的仓 + Integer warehouseId1 = waybillEntity.getWarehouseId(); BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); + if(Objects.isNull(endhouse)){ + endhouse = basicdataWarehouseClient.getWarehouseByOldId(warehouseId1); + } Long endWarehouseId = endhouse.getId(); if(endWarehouseId.equals(warehouseId)){ entity.setIsTransfer(0);