clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server 

# Conflicts:
#	src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java
#	src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
This commit is contained in:
LiJianZhao 2025-04-24 10:14:48 +08:00
parent 4237959387 9f0edc3329
commit e8736a3b3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
View File

@ -50,9 +50,6 @@ public class InventoryService extends BaseService {
private InventoryPurchaseMapper inventoryPurchaseMapper; private InventoryPurchaseMapper inventoryPurchaseMapper;
@Autowired @Autowired
private InventoryPurchaseLogMapper inventoryPurchaseLogMapper; private InventoryPurchaseLogMapper inventoryPurchaseLogMapper;
@Autowired
@Lazy
private InventoryService inventoryService;
public List<Inventory> listByOrderCode(String orderCode) { public List<Inventory> listByOrderCode(String orderCode) {
QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>(); QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
@ -397,6 +394,9 @@ public class InventoryService extends BaseService {
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public InventoryLog changeNumber(Integer id, Type type, Integer changeWholeNumber, Integer changeFragmentNumber, String remark) { public InventoryLog changeNumber(Integer id, Type type, Integer changeWholeNumber, Integer changeFragmentNumber, String remark) {
return changeNumberCore(id, type, changeWholeNumber, changeFragmentNumber, remark);
}
private InventoryLog changeNumberCore(Integer id, Type type, Integer changeWholeNumber, Integer changeFragmentNumber, String remark) {
// 1. 获取库存记录 // 1. 获取库存记录
Inventory inventory = inventoryMapper.selectById(id); Inventory inventory = inventoryMapper.selectById(id);
if (inventory == null) { if (inventory == null) {
@ -491,11 +491,11 @@ public class InventoryService extends BaseService {
.eq("good_id", goodsId) .eq("good_id", goodsId)
.orderByDesc("create_datetime").last("limit 1")); .orderByDesc("create_datetime").last("limit 1"));
list.add(inventoryService.changeNumber(inventory.getId(), Type.IN, changeWhole, changeFragment, remark)); list.add(this.changeNumberCore(inventory.getId(), Type.IN, changeWhole, changeFragment, remark));
} else { } else {
changeFragment = -changeFragment; changeFragment = -changeFragment;
changeWhole = -changeWhole; changeWhole = -changeWhole;
list = inventoryService.outByGoodsId(goodsId, changeWhole, changeFragment, remark); list = this.outByGoodsId(goodsId, changeWhole, changeFragment, remark);
} }
return list; return list;
} }
@ -535,7 +535,7 @@ public class InventoryService extends BaseService {
int deductFragment = deduct % goods.getMinPackagingNumber(); int deductFragment = deduct % goods.getMinPackagingNumber();
// 调用现有方法执行出库 // 调用现有方法执行出库
result.add(inventoryService.changeNumber(inv.getId(), Type.OUT, deductWhole, deductFragment, remark)); result.add(this.changeNumberCore(inv.getId(), Type.OUT, deductWhole, deductFragment, remark));
// 更新剩余需要扣除量 // 更新剩余需要扣除量
requiredTotalFragment -= deduct; requiredTotalFragment -= deduct;