From 44715f7265e632c3ae9bd8b1d8f0355f050186a7 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 3 Feb 2024 19:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseUpdownStockupAreaMapper.xml       | 18 +++++++++++++++++-
 .../WarehouseUpdownStockupAreaServiceImpl.java |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
index 448c74057..395dbc2ac 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.xml
@@ -114,7 +114,23 @@
         ldsa.id
     </select>
     <select id="selectStockUpAreaStockList" resultType="java.util.Map">
-
+        SELECT
+        lwusa.materiel_code,
+        lwusa.materiel_name,
+        ldsl.quantity_stock,
+        ldsl.order_code,
+        ldsl.market_name,
+        lwusa.market_id,
+        lwusa.incoming_batch,
+        sum(lwusa.num)
+        FROM
+        logpm_warehouse_updown_stockup_area AS lwusa
+        LEFT JOIN logpm_distribution_stock_list AS ldsl ON lwusa.association_value = ldsl.cargo_number
+        AND lwusa.market_id = ldsl.market_id
+        WHERE
+        lwusa.allocation_id = #{allocationId} AND lwusa.association_type in( '3','5') AND goods_type = '2'
+        GROUP BY
+        lwusa.incoming_batch
     </select>
 
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
index 0d1767477..920c7700b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
@@ -519,7 +519,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		updownStockupAreaEntity.setIncomingBatch(upShelfStockDTO.getIncomingBatch());
 		updownStockupAreaEntity.setAssociationType("3");
 		updownStockupAreaEntity.setUpdownType("物料");
-		updownStockupAreaEntity.setGoodsType("1");
+		updownStockupAreaEntity.setGoodsType("2");
 		updownStockupAreaEntity.setNum(upShelfStockDTO.getEnterNum());
 		updownStockupAreaEntity.setMarketId(upShelfStockDTO.getMarketId());
 		updownStockupAreaEntity.setMaterielCode(upShelfStockDTO.getMaterialCode());