From d66d71219f0f052d238aad70321ad0b6724de14a Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 9 Oct 2023 10:39:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=AF=E8=A7=86=E5=8C=96=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/WarehouseGoodsAllocationMapper.java       |  2 ++
 .../mapper/WarehouseGoodsAllocationMapper.xml        | 12 ++++++++++--
 .../impl/WarehouseGoodsAllocationServiceImpl.java    |  4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
index 25cc11905..8115963b9 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
@@ -167,4 +167,6 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 
 
 	List<Long> selectIsStocking(@Param("allocationId") Long allocationId);
+
+	Integer selectOrderNum(@Param("id") Long id);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
index db4a407ef..3897c842b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
@@ -19,8 +19,7 @@
         FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment}
     </select>
     <select id="selectnum" resultType="com.logpm.warehouse.vo.WarehouseGoodsAllocationVO">
-        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN num END), 0) orderNum,
-               COALESCE(SUM(CASE WHEN association_type = '2' THEN num END), 0) lessNum,
+        SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN num END), 0) lessNum,
                COALESCE(SUM(CASE WHEN association_type = '3' THEN num END), 0) packageNum,
                COALESCE(SUM(CASE WHEN association_type = '4' THEN num END), 0) inventoryNum
         FROM logpm_warehouse_updown_goods
@@ -362,6 +361,15 @@
         SELECT lwgaa.id FROM logpm_warehouse_goods_allocation lwgaa join logpm_warehouse_goods_area lwga on  lwgaa.goods_area_id =lwga.id WHERE
             lwgaa.id = #{allocationId} and lwgaa.is_deleted = 0 and lwga.area_type ='1'
     </select>
+    <select id="selectOrderNum" resultType="java.lang.Integer">
+        SELECT  COALESCE
+                    ( count( DISTINCT ldpl.stock_article_id), 0 )
+        FROM
+            logpm_warehouse_updown_goods lwug
+                JOIN logpm_distribution_parcel_list ldpl ON lwug.association_id = ldpl.id
+        where lwug.allocation_id = #{id}
+          and lwug.is_deleted = 0
+    </select>
 
 
 </mapper>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
index 2fd12ccf7..891cb8d5c 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
@@ -398,7 +398,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 		Func.copy(warehouseGoodsAllocationEntity,warehouseGoodsAllocationVO);
 		//查询数量
 		WarehouseGoodsAllocationVO	warehouseGoodsAllocationVOData = baseMapper.selectnum(warehouseGoodsAllocationEntity.getId());
-		warehouseGoodsAllocationVO.setOrderNum(warehouseGoodsAllocationVOData.getOrderNum());
+		//查询订单数量
+		Integer i = baseMapper.selectOrderNum(warehouseGoodsAllocationEntity.getId());
+		warehouseGoodsAllocationVO.setOrderNum(i);
 		warehouseGoodsAllocationVO.setInventoryNum(warehouseGoodsAllocationVOData.getInventoryNum());
 		warehouseGoodsAllocationVO.setLessNum(warehouseGoodsAllocationVOData.getLessNum());
 		warehouseGoodsAllocationVO.setPackageNum(warehouseGoodsAllocationVOData.getPackageNum());