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