diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 3f3582e..4b2bb41 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -50,9 +50,6 @@ public class InventoryService extends BaseService { private InventoryPurchaseMapper inventoryPurchaseMapper; @Autowired private InventoryPurchaseLogMapper inventoryPurchaseLogMapper; - @Autowired - @Lazy - private InventoryService inventoryService; public List listByOrderCode(String orderCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -397,6 +394,9 @@ public class InventoryService extends BaseService { } @Transactional(rollbackFor = Exception.class) 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. 获取库存记录 Inventory inventory = inventoryMapper.selectById(id); if (inventory == null) { @@ -491,11 +491,11 @@ public class InventoryService extends BaseService { .eq("good_id", goodsId) .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 { changeFragment = -changeFragment; changeWhole = -changeWhole; - list = inventoryService.outByGoodsId(goodsId, changeWhole, changeFragment, remark); + list = this.outByGoodsId(goodsId, changeWhole, changeFragment, remark); } return list; } @@ -535,7 +535,7 @@ public class InventoryService extends BaseService { 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;