From a872e71dddd917086f18482ee9b72b75a345d8c3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 15 Aug 2024 11:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DistributionSignforClient.java | 9 ++++++++- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- .../service/IDistributionSignforService.java | 7 ++++--- .../impl/DistributionSignforServiceImpl.java | 18 +++++++++++++++--- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java index 41bd963a3..05abf4554 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.feign.IBasicdataTripartiteWarehouseClient; import com.logpm.distribution.entity.*; import com.logpm.distribution.mapper.*; +import com.logpm.distribution.service.IDistributionLoadscaninvnService; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.service.IDistributionStockService; import com.logpm.distribution.vo.DistributionSignPrintVO; @@ -34,6 +35,7 @@ import com.logpm.oldproject.feign.IWarehouseClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RedisKeyConstant; +import org.springblade.common.constant.loading.LoadingStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -73,6 +75,7 @@ public class DistributionSignforClient implements IDistributionSignforClient { private final DistributionSignforMapper distributionSignforMapper; private final DistributionDeliveryListMapper distributionDeliveryListMapper; private final DistributionReservationMapper distributionReservationMapper; + private final IDistributionLoadscaninvnService distributionLoadscaninvnService; private final DistributionDeliverySelfMapper distributionDeliverySelfMapper; @@ -121,7 +124,11 @@ public class DistributionSignforClient implements IDistributionSignforClient { - return null; + + + + + return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 1c365606e..b1aca42d6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -52,7 +52,7 @@ dbl.total_cost AS totalCost, dbl.pick_up_plate AS pickUpPlate, dbl.pickup_batch AS pickupBatch, - ( SELECT IFNULL(SUM(quantity),0 FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum, + ( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum, ( SELECT group_concat( splice ) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index b0e022919..6dd5b6521 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -369,10 +369,11 @@ public interface IDistributionSignforService extends BaseService checkAddValuePCPackageList(Long reservationId); + /** - * - * @param orderCode + * 推送库存品包件 + * @param orderPackageCode * @return */ - Map clerkCheckPushZeroData(String orderCode); + Map clerkInventoryCheckPushData(String orderPackageCode); } 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 920339148..906765f13 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 @@ -6803,15 +6803,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl clerkCheckPushZeroData(String orderCode) { - + @Override + public Map clerkInventoryCheckPushData(String orderPackageCode) { + //查询此包件 + List loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.query().lambda() + .eq(DistributionLoadscaninvnEntity::getOrderPackageCode, orderPackageCode) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + if (!loadscaninvnEntityList.isEmpty()) { + //未进行装车 + } + if (loadscaninvnEntityList.size()>1) { + //存在多个记录 + } + DistributionLoadscaninvnEntity loadscaninvnEntity = loadscaninvnEntityList.get(0); return null; + } private void buildNameAndPhone(List pushOldPackageSigning) {