备货库存品库位BUG修复

5 months ago · aed9bdb5a2
2 changed files with 1 additions and 11 deletions
--- 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<String, Object> clerkInventoryCheckPushData(String orderPackageCode) {
-
-
-
-
-
-
-
 		return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode);
 	}

--- 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