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

新增预约单查不到;

Browse Source
This commit is contained in:
王奎兴
2026-07-03 21:57:17 +08:00
parent ebfd3c3f2e
commit fb4c508873
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
+5 -8
View File
@@ -79,6 +79,10 @@ public class ReserveStockInOrderApplicationService {
*/
public List<ReserveStockInOrderPO> 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);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+12
View File
@@ -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);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+12
View File
@@ -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);