DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Joshi
2025-07-01 11:14:59 +08:00
parent 1f60cb195a 10e92c43e8
commit d542095080
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java
View File

@@ -170,6 +170,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
// 2、 无则直接新增项目 有则直接增加库存数量 // 2、 无则直接新增项目 有则直接增加库存数量
Long flag; Long flag;
if (select == null) { if (select == null) {
baseMapper.insert(add); baseMapper.insert(add);
flag = add.getId(); flag = add.getId();
} else { } else {
@@ -178,6 +179,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
select.setPrice((select.getPrice() * select.getInventory() + bo.getPrice() * bo.getInventory()) / (select.getInventory() + bo.getInventory())); select.setPrice((select.getPrice() * select.getInventory() + bo.getPrice() * bo.getInventory()) / (select.getInventory() + bo.getInventory()));
} }
baseMapper.updateById(select);
flag = select.getId(); flag = select.getId();
} }