From 424be41f7b1c0a828b93c5a6e2e01ea08f35c571 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 17 Mar 2024 01:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=AD=BE=E6=94=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.xml | 2 +- .../service/impl/DistributionSignforServiceImpl.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 02e7d13cd..fbb6afa6a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1715,7 +1715,7 @@ ldpl.id AS id, ldrzp.quantity AS reservationNum, IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum, - IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS signingNum , + IF(ldl.received_quantity is null,0,ldl.loaded_nub) AS signingNum , CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub) WHEN 0 THEN '待装车' ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 454e0e37a..692d09cec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -900,8 +900,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId()); //查询该车次负责司机 - - for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) { //查询订单 DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(reservationZeroPackageEntity.getStockArticleId()); @@ -919,7 +917,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionLoadscanEntity::getReservationId, reservationId) - .in(DistributionLoadscanEntity::getPackageId, list) + .in(DistributionLoadscanEntity::getPackageId, reservationZeroPackageEntity.getParcelListId()) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (Func.isEmpty(loadscanEntity)) {