From d31f63f7ad6b427856ddf5f9a1ca1028f5d57c2d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 20 Jul 2022 09:35:12 +0800
Subject: [PATCH] 农产品4种出库功能完善
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 6 +++---
src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java | 5 ++++-
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 4 ++--
3 files changed, 9 insertions(+), 6 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));
}
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
index e1482f1..ffe1957 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
@@ -30,5 +30,8 @@
@EqualsAndHashCode(callSuper = true)
public class InventoryVO extends Inventory {
private static final long serialVersionUID = 1L;
-
+ /**
+ * 库存量主键id
+ */
+ private String proid;
}
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index 522d9f9..5e296bf 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -113,12 +113,12 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入sale")
public R submit(@Valid @RequestBody SaleVO sale) {
- boolean res = farmProductStockService.stockCompare(sale.getSaleNum(),sale.getStrainId());
+ boolean res = farmProductStockService.stockCompare(sale.getSaleNum(),sale.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- farmProductStockService.stockReduce(sale.getSaleNum(),sale.getStrainId());
+ farmProductStockService.stockReduce(sale.getSaleNum(),sale.getProid());
}
return R.status(saleService.saveOrUpdate(sale));
}
--
Gitblit v1.9.3