From aed9bdb5a2db71f2efd807a306aa7f0f28434160 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 15 Aug 2024 17:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=BA=93=E4=BD=8DBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/feign/DistributionSignforClient.java | 7 ------- .../distribution/mapper/DistributionReservationMapper.xml | 5 +---- 2 files changed, 1 insertion(+), 11 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 05abf4554..f93bab9a0 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 @@ -121,13 +121,6 @@ public class DistributionSignforClient implements IDistributionSignforClient { @Override public Map clerkInventoryCheckPushData(String orderPackageCode) { - - - - - - - return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode); } 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 95738205c..991c55ff7 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 @@ -320,10 +320,7 @@ newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND FIND_IN_SET(newldrs.stocklist_id,t.aaa)) AS planNum, - CASE ldslNew.source_type - WHEN 1 THEN t1.allocation_ids - ELSE t2.allocation_ids - END allocations + GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations, FROM ( SELECT