From 50a1b5d7d958a7537378904de3ee4d45d18183a9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 9 Dec 2024 17:02:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
index 872ee136f..8ddaece73 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
@@ -873,7 +873,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
 		//查询计划数量
 		Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(warehouseId);
-		indexSignforDayDataVO.setPlanNum(dayClerkSignforNum);
+		indexSignforDayDataVO.setPlanNum(dayPlanByday);
 		//计算文员签收率
 		indexSignforDayDataVO.setClerkSignforScale("0.0000");
 		if (dayClerkSignforNum > 0 && dayPlanByday > 0) {

From d642fe4f8d6684f0b16d29de46d365a488f44bff Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 9 Dec 2024 17:46:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/report/mapper/WarehouseIndexMapper.xml    | 5 +++--
 .../logpm/report/service/impl/WarehouseIndexServiceImpl.java | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
index cbd80b98c..7fabd9afc 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
@@ -869,7 +869,8 @@
         IFNULL(SUM(IF(type_service='3',hand_quantity,0)),0) billNum,
         IFNULL(SUM(IF(type_service='4',hand_quantity,0)),0) thirdTransferNum
         from logpm_distribution_stock_article
-        WHERE 1=1
+        WHERE
+        is_deleted = 0
         and warehouse_id in
         <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -942,7 +943,7 @@
     </select>
     <select id="findTripartiteDeliveryTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
         SELECT
-        warehouse_name,
+        warehouse_name AS warehouseName,
         warehouse_id,
         type AS type,
         count( 1 ) AS totalNum
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
index 8ddaece73..24169689f 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
@@ -448,6 +448,8 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			Integer upshelfNum = Objects.isNull(warehouseNumberVO4) ? 0 : warehouseNumberVO4.getCountNumber();
 
 			indexAllocationDataVO.setTotalNum(totalAllocationNum);
+			indexAllocationDataVO.setWarehouseId(handOrderDataByWarehouseIdVO.getWarehouseId());
+			indexAllocationDataVO.setWarehouseName(handOrderDataByWarehouseIdVO.getWarehouseName());
 			indexAllocationDataVO.setUseNum(useAllocationNum);
 			indexAllocationDataVO.setNullNum(totalAllocationNum - useAllocationNum);
 			indexAllocationDataVO.setUpshelfNum(upshelfNum);