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/sale/controller/SaleController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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