From 9c1e4091094c6b588c3fd998dbad3dc4fbd04a57 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 02 Aug 2022 10:11:23 +0800
Subject: [PATCH] 新增加工产品库存，删除加工记录表中数据，农产品和加工产品数据回滚
---
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 3884491..b6484b2 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -31,6 +31,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.farmplant.service.FarmProductStockService;
import org.springblade.modules.process.service.IProcessService;
+import org.springblade.modules.processInv.entity.ProcessInv;
+import org.springblade.modules.processInv.service.IProcessInvService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +40,8 @@
import org.springblade.modules.sale.vo.SaleVO;
import org.springblade.modules.sale.service.ISaleService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
/**
* 销售记录表 控制器
@@ -53,8 +57,8 @@
private final ISaleService saleService;
private final FarmProductStockService farmProductStockService;
- private final IProcessService processService;
-
+// private final IProcessService processService;
+ private final IProcessInvService processInvService;
/**
* 详情
*/
@@ -132,13 +136,28 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "新增或修改", notes = "传入sale")
public R submitProcess(@Valid @RequestBody SaleVO sale) {
+// //对比加工表库存量
+// boolean res = processService.stockCompare(sale.getSaleNum(),sale.getProid());
+// if (!res){
+// throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
+// }else {
+// //库存充足，减去相应库存
+// processService.stockReduce(sale.getSaleNum(),sale.getProid());
+// }
+// return R.status(saleService.saveOrUpdate(sale));
//对比加工表库存量
- boolean res = processService.stockCompare(sale.getSaleNum(),sale.getProid());
+ boolean res = processInvService.stockCompare(sale.getSaleNum(),sale.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- processService.stockReduce(sale.getSaleNum(),sale.getProid());
+ processInvService.stockReduce(sale.getSaleNum(),sale.getProid());
+ //更新updateTIme 和 updateUser
+ ProcessInv processInv = new ProcessInv();
+ processInv.setUpdateUser(sale.getCreateUser());
+ processInv.setUpdateTime(new Date());
+ processInv.setId(Long.parseLong(sale.getProid()));
+ processInvService.updateById(processInv);
}
return R.status(saleService.saveOrUpdate(sale));
}
--
Gitblit v1.9.3