From 7f92a18ee9c087f2070a62e71199c5af20ee7fc0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 20 Feb 2024 16:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/WarehouseUpdownStockupAreaMapper.java |  8 ++++++++
 .../mapper/WarehouseUpdownStockupAreaMapper.xml  | 16 ++++++++++++++++
 .../WarehouseUpdownStockupAreaServiceImpl.java   |  6 ++++++
 3 files changed, 30 insertions(+)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java
index 98e4c5370..43e87f851 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownStockupAreaMapper.java
@@ -82,4 +82,12 @@ public interface WarehouseUpdownStockupAreaMapper extends BaseMapper<WarehouseUp
 	 * @return
 	 */
 	List<Map<String, Object>> selectStockUpAreaStockList(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId);
+
+	/**
+	 *
+	 * @param warehouseId
+	 * @param allocationId
+	 * @return
+	 */
+	List<Map<String, Object>> selectStockUpAreaZeroStockArticle(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId );
 }
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 8ee43e3f8..423485a7d 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
@@ -135,6 +135,22 @@
         GROUP BY
         lwusa.incoming_batch
     </select>
+    <select id="selectStockUpAreaZeroStockArticle" resultType="java.util.Map">
+        SELECT
+        ldsa.order_code AS orderCode,
+        ldsa.waybill_number AS waybillNumber,
+        ldsa.total_number AS totalNumber,
+        lwusa.num AS totalNum,
+        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete,
+        2 AS goodsType
+        FROM
+        logpm_warehouse_updown_stockup_area AS lwusa
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldsa.id = lwusa.association_id
+        WHERE
+        lwusa.allocation_id = #{allocationId} AND lwusa.warehouse_id = #{warehouseId} AND  lwusa.goods_type = '2' AND lwusa.association_type IN ('1')
+        GROUP BY
+        ldsa.id
+    </select>
 
 
 </mapper>
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 e901d53bb..1b39496a9 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
@@ -365,6 +365,12 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 				List<Map<String,Object>> inventoryMap = baseMapper.selectStockUpAreaStockList(warehouseId,allocationId);
 				maps.addAll(inventoryMap);
 			}
+			//查询无数据零担订单信息
+			List<WarehouseUpdownStockupAreaEntity> notSourceOrderData = warehouseUpdownStockupAreaEntities.stream().filter(f -> "2".equals(f.getGoodsType())&& "1".equals(f.getAssociationType())).collect(Collectors.toList());
+			if (Func.isNotEmpty(notSourceOrderData)){
+				List<Map<String,Object>> zeroStockArticleMap = baseMapper.selectStockUpAreaZeroStockArticle(warehouseId,allocationId);
+				maps.addAll(zeroStockArticleMap);
+			}
 		}
 		return R.data(maps);
 	}