From fb4c50887346e44723a961dc45d68492c561decf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 3 Jul 2026 21:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E7=BA=A6=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReserveStockInOrderApplicationService.java | 13 +++++-------- .../service/ReserveStockInOrderDomainService.java | 12 ++++++++++++ .../service/ReserveStockOutOrderDomainService.java | 12 ++++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java index f0ef8b9f4..a31ca9db3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java @@ -79,6 +79,10 @@ public class ReserveStockInOrderApplicationService { */ public List queryList(ReserveStockInOrderDO stockInOrderDO) { + Long shipperId = stockInOrderDO.getShipperId(); + if (shipperId != null && shipperId != 0L ) { + return stockInOrderDomainService.queryList(stockInOrderDO); + } LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null && loginUser.getUserPo() != null){ Long userOrganizationId = loginUser.getUserPo().getOrganizationId(); @@ -127,14 +131,7 @@ public class ReserveStockInOrderApplicationService { stockInOrderDO.setTopOrganizationId(2827L); } } - // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值 - if (stockInOrderDO.getWarehouseId() == null) { -// AssociationWarehouseCacheDO associationWarehouseCacheDO = -// SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); -// if (associationWarehouseCacheDO != null) { -// stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); -// } - } + } return stockInOrderDomainService.queryList(stockInOrderDO); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java index 79e937e65..ad07ed014 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java @@ -120,6 +120,10 @@ public class ReserveStockInOrderDomainService { //统计总体积 BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); stockInOrderDO.setVolumeLimit(volumeLimit); + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockInOrderService.insert(stockInOrderDO); return materialDetailService.batchInsert(stockInOrderDO.getInOrderNumber(), stockInOrderDO.getMaterialDetailList()); } @@ -145,6 +149,10 @@ public class ReserveStockInOrderDomainService { // //统计总体积 // BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); // stockInOrderDO.setVolumeLimit(volumeLimit); + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockInOrderService.insert(stockInOrderDO); materialDetailService.batchInsert(stockInOrderDO.getInOrderNumber(), stockInOrderDO.getMaterialDetailList()); } @@ -174,6 +182,10 @@ public class ReserveStockInOrderDomainService { //统计总体积 BigDecimal volumeLimit = stockInOrderDO.getMaterialDetailList().stream().map(ReserveInMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); stockInOrderDO.setVolumeLimit(volumeLimit); + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockInOrderService.update(stockInOrderDO); ReserveInMaterialDetailBaseDO inMaterialDetailBaseDO = new ReserveInMaterialDetailBaseDO(); BeanUtils.copyProperties(stockInOrderPO, inMaterialDetailBaseDO); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java index 600cef7f2..ac089dd68 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java @@ -104,6 +104,10 @@ public class ReserveStockOutOrderDomainService { if (stockOutOrderDO.getCheckTaskDistribution() == null) { stockOutOrderDO.setCheckTaskDistribution(2); } + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockOutOrderService.insert(stockOutOrderDO); return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); } @@ -134,6 +138,10 @@ public class ReserveStockOutOrderDomainService { if (stockOutOrderDO.getCheckTaskDistribution() == null) { stockOutOrderDO.setCheckTaskDistribution(2); } + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockOutOrderService.insert(stockOutOrderDO); outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); } @@ -161,6 +169,10 @@ public class ReserveStockOutOrderDomainService { //统计总体积 BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReserveOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); stockOutOrderDO.setVolumeLimit(volumeLimit); + LoginUser loginUser = SecurityUtils.getLoginUser(); + stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockOutOrderService.update(stockOutOrderDO); ReserveOutMaterialDetailBaseDO outMaterialDetailBaseDO = new ReserveOutMaterialDetailBaseDO(); BeanUtils.copyProperties(stockOutOrderDO, outMaterialDetailBaseDO);