weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

及时库存查询收货数逻辑修改;

Browse Source
This commit is contained in:
王奎兴
2026-02-12 11:00:28 +08:00
parent 9c75a8dd03
commit fc6a36a6d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class StatementStatisticsService {
try { try {
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null) { if (associationWarehouseCacheDO != null) {
if (associationWarehouseCacheDO.getWarehouseId() != null) { /*if (associationWarehouseCacheDO.getWarehouseId() != null) {
immediateInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); immediateInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
} }
if (associationWarehouseCacheDO.getWarehouseCode() != null && !associationWarehouseCacheDO.getWarehouseCode().trim().isEmpty()) { if (associationWarehouseCacheDO.getWarehouseCode() != null && !associationWarehouseCacheDO.getWarehouseCode().trim().isEmpty()) {
@@ -76,7 +76,7 @@ public class StatementStatisticsService {
} }
if (associationWarehouseCacheDO.getWarehouseName() != null && !associationWarehouseCacheDO.getWarehouseName().trim().isEmpty()) { if (associationWarehouseCacheDO.getWarehouseName() != null && !associationWarehouseCacheDO.getWarehouseName().trim().isEmpty()) {
immediateInventoryDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); immediateInventoryDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName());
} }*/
} }
} catch (Exception e) { } catch (Exception e) {
// 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库） // 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库）
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+1 -1
View File
@@ -459,7 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND d.del_flag = 1 AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
WHERE 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 e.warehouse_id = a.warehouse_id
AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_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 AND c.material_base_info_id = a.material_base_info_id