From 0f0ebe062401a29b261e740efab6741227bd6722 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 12 Apr 2024 00:41:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=201.=E4=BC=98=E5=8C=96=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E6=98=8E=E7=BB=86=E7=9A=84=E6=9F=A5=E8=AF=A2=202.?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86=E5=8F=AF=E4=BB=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=A8=E4=BB=93=E6=95=B0=E6=8D=AE=203.=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E5=87=86=E5=A4=87=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=BC=80=E5=8D=95=E6=95=B0=E9=87=8F=E8=AE=A1?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=93=81=E7=B1=BB=E6=95=B0=E9=87=8F=E8=A1=A8?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionParcelListMapper.xml | 2 +- .../impl/DistributionParcelListServiceImpl.java | 16 ++++++++++++---- .../impl/WarehouseWaybillServiceImpl.java | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 74d3f9716..1689d8f3d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -174,7 +174,7 @@ and ldpl.stock_article_id like concat('%',#{param.stockArticleId},'%') - and ldpl.order_code like concat('%',#{param.orderCode},'%') + and ldpl.order_code like concat(#{param.orderCode},'%') and ldpl.service_number like concat('%',#{param.serviceNumber},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index f3b6496df..c9992cf40 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -147,10 +147,18 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { - List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); - List collect = myWatchWarehouse.stream() - .map(BasicdataWarehouseEntity::getId) - .collect(Collectors.toList()); + BasicdataWarehouseEntity myWatchWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + List collect = new ArrayList<>(); + if(ObjectUtils.isNull(myWatchWarehouse)){ + List myWatchWarehouse1 = basicdataWarehouseClient.getMyWatchWarehouse(); + myWatchWarehouse1.forEach(t->{ + collect.add(t.getId()); + }); + + }else{ + collect.add(myWatchWarehouse.getId()); + } + distributionParcelList.setWarehouseIdList(collect); List distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList); return page.setRecords(distributionParcelListEntities); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 12531b4d9..aa1164d68 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -306,7 +306,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl Date: Fri, 12 Apr 2024 09:03:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=9A=E4=B8=AA=E5=8F=B8=E6=9C=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index de79c42cc..0463bbd35 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -340,10 +340,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2)); - distributionDeliveryListVO.setDriverName(deliverySelfServiceOne.getDriverName()); - distributionDeliveryListVO.setDriverPhone(deliverySelfServiceOne.getDriverPhone()); - distributionDeliveryListVO.setVehicleName(deliverySelfServiceOne.getVehicleNub()); + List deliverySelfServices = distributionDeliverySelfService.list(Wrappers.query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2)); + + if(!deliverySelfServices.isEmpty()){ + StringBuffer sb1 = new StringBuffer(); + StringBuffer sb2 = new StringBuffer(); + StringBuffer sb3 = new StringBuffer(); + deliverySelfServices.forEach(t->{ + if(!sb1.toString().isEmpty()){ + sb1.append("/"); + } + sb1.append(t.getDriverName()); + + if(!sb2.toString().isEmpty()){ + sb2.append("/"); + } + sb2.append(t.getDriverPhone()); + + + if(!sb3.toString().isEmpty()){ + sb3.append("/"); + } + sb3.append(t.getVehicleNub()); + }); + + distributionDeliveryListVO.setDriverName(sb1.toString()); + distributionDeliveryListVO.setDriverPhone(sb2.toString()); + distributionDeliveryListVO.setVehicleName(sb3.toString()); + } + + } else { DistributionDeliveryTripartiteEntity deliveryTripartiteEntity = distributionDeliveryTripartiteService.getOne(Wrappers.query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionDeliveryListVO.getId())); distributionDeliveryListVO.setDriverName(deliveryTripartiteEntity.getDriverName());