From fc6a36a6d997067ba11b57d17d4f51eec8e4ad66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 12 Feb 2026 11:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8A=E6=97=B6=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=B6=E8=B4=A7=E6=95=B0=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statementStatistics/StatementStatisticsService.java | 4 ++-- .../mapper/materialInventory/MaterialInventoryMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java index 4b13ec963..b3ca3ae4f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java @@ -68,7 +68,7 @@ public class StatementStatisticsService { try { AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); if (associationWarehouseCacheDO != null) { - if (associationWarehouseCacheDO.getWarehouseId() != null) { + /*if (associationWarehouseCacheDO.getWarehouseId() != null) { immediateInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); } if (associationWarehouseCacheDO.getWarehouseCode() != null && !associationWarehouseCacheDO.getWarehouseCode().trim().isEmpty()) { @@ -76,7 +76,7 @@ public class StatementStatisticsService { } if (associationWarehouseCacheDO.getWarehouseName() != null && !associationWarehouseCacheDO.getWarehouseName().trim().isEmpty()) { immediateInventoryDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); - } + }*/ } } catch (Exception e) { // 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库） diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 37ff88dfd..ab1b2f821 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -459,7 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND d.del_flag = 1 LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number WHERE - c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 3 + c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 4 AND e.warehouse_id = a.warehouse_id AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id) AND c.material_base_info_id = a.material_base_info_id