From 2af6fc082247372eb11fb54320345c0fcfa26518 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 20 Jul 2022 12:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
index 558f81d..57ca548 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -110,13 +110,13 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入sale")
- public R submit(@Valid @RequestBody Inventory inventory) {
- boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getStrainId());
+ public R submit(@Valid @RequestBody InventoryVO inventory) {
+ boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getStrainId());
+ farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
}
return R.status(inventoryService.saveOrUpdate(inventory));
}
--
Gitblit v1.9.3