From c6eac659513c563c147c0e2d5fd5173bdec8a20a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 22 Jan 2024 19:16:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockListServiceImpl.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index bd9de0544..ba0f8153e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -219,7 +219,6 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	/**
 	 *
 	 * @param distributionStockListDTO
-	 * @return
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -296,6 +295,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		stockListEntity.setUnpackingQuantity( list.get(0).getUnpackingQuantity() + distributionStockListDTO.getUnpackingQuantity());
 		this.updateById(stockListEntity);
 
+
 		//添加拆包记录
 		DistributionUnpackingDetailsEntity distributionUnpackingDetails= new DistributionUnpackingDetailsEntity();
 		distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(list.get(0).getStockArticleId()).orElse(null));

From 2ce30d2ea367e83fedce9bc534ce30856493e093 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 22 Jan 2024 19:16:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=93=81=E6=98=8E=E7=BB=86=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockListMapper.xml     | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 fe64a6995..04dfc1663 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
@@ -390,8 +390,9 @@
 
     <select id="listAllocationOrder" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
         select lwug.position_code allocationTitle,
+        lwug.allocation_id,
         ldsi.market_name marketName,
-        lwug.num,
+        sum(lwug.num) num,
         lwug.create_time createTime,
         ldsi.cargo_unit cargoUnit,
         ldsi.unpack,
@@ -402,10 +403,11 @@
         logpm_distribution_stock_list ldsi
         left join logpm_distribution_stock_list_info ldsli on ldsli.material_id = ldsi.material_id AND ldsli.warehouse_id = ldsi.warehouse_id
         AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
-        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '4'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
         <where>
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
         </where>
+        group by lwug.allocation_id
     </select>