From 1d1f8d60d0a9f7abf12d85aa5bff3b9c496873cf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 17 Oct 2024 20:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFBUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockListMapper.xml    | 23 +++++++++++++++----
 .../WarehouseWarehousingEntryServiceImpl.java |  1 -
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 8807419b5..24a657ee8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -381,11 +381,24 @@
           and ldsl.warehouse_id = #{warehouseId}
     </select>
     <select id="listAllocation" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
-        select lwug.position_code allocationTitle,ldsi.market_name marketName,lwug.num,lwug.create_time createTime,ldsi.cargo_unit cargoUnit,
-        ldsi.unpack,ldsi.quantity_stock quantityStock,ldsi.unpacking_quantity unpackingQuantity,ldsi.description_goods descriptionGoods
-        from logpm_distribution_stock_list ldsi
-        LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch
-        and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id
+        SELECT
+        lwga.qr_code allocationTitle,
+        ldsi.market_name marketName,
+        lwug.num,
+        lwug.create_time createTime,
+        ldsi.cargo_unit cargoUnit,
+        ldsi.unpack,
+        ldsi.quantity_stock quantityStock,
+        ldsi.unpacking_quantity unpackingQuantity,
+        ldsi.description_goods descriptionGoods
+        FROM
+        logpm_distribution_stock_list ldsi
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsi.material_id = lwug.association_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id
+        AND ldsi.incoming_batch = lwug.incoming_batch
+        AND ldsi.market_id = lwug.market_id
+        AND lwug.association_type = '4'
+        AND lwug.warehouse_id = ldsi.warehouse_id
         <where>
             lwug.id is not null
             <if test="param.materialId != null and param.materialId != '' "> and  ldsi.material_id = #{param.materialId}</if>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index 5f5fa4efd..d677706be 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -435,7 +435,6 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				} else {
 					//进行打托操作
 					BasicdataTrayEntity basicdataTray = basicdataTrayClient.findByTrayName(warehousingDetail.getTrayName());
-
 					List<NoDataStockListDTO> noDataStockListDTOS = new ArrayList<>();
 					NoDataStockListDTO noDataStockListDTO = new NoDataStockListDTO();
 					noDataStockListDTO.setMarketId(entity.getMarketId());