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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
赵辉
2026-07-04 00:08:36 +08:00
parent 4a6421c9cf 9e71401716
commit 429c279b78
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+6 -6
View File
@@ -122,8 +122,8 @@ public class ReserveStockInOrderDomainService {
stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderService.insert(stockInOrderDO);
return materialDetailService.batchInsert(stockInOrderDO.getInOrderNumber(), stockInOrderDO.getMaterialDetailList());
}
@@ -151,8 +151,8 @@ public class ReserveStockInOrderDomainService {
// stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderService.insert(stockInOrderDO);
materialDetailService.batchInsert(stockInOrderDO.getInOrderNumber(), stockInOrderDO.getMaterialDetailList());
}
@@ -184,8 +184,8 @@ public class ReserveStockInOrderDomainService {
stockInOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser();
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// 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
+6 -6
View File
@@ -106,8 +106,8 @@ public class ReserveStockOutOrderDomainService {
}
LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.insert(stockOutOrderDO);
return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
}
@@ -140,8 +140,8 @@ public class ReserveStockOutOrderDomainService {
}
LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.insert(stockOutOrderDO);
outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
}
@@ -171,8 +171,8 @@ public class ReserveStockOutOrderDomainService {
stockOutOrderDO.setVolumeLimit(volumeLimit);
LoginUser loginUser = SecurityUtils.getLoginUser();
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderService.update(stockOutOrderDO);
ReserveOutMaterialDetailBaseDO outMaterialDetailBaseDO = new ReserveOutMaterialDetailBaseDO();
BeanUtils.copyProperties(stockOutOrderDO, outMaterialDetailBaseDO);