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/InventoryLoss/controller/InventoryController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 c1d0851..ebd86c8 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -33,9 +33,12 @@
import org.springblade.modules.InventoryLoss.service.InventoryService;
import org.springblade.modules.InventoryLoss.vo.InventoryVO;
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 javax.validation.Valid;
+import java.util.Date;
/**
* 库存损耗记录表 控制器
@@ -51,8 +54,8 @@
private final InventoryService inventoryService;
private final FarmProductStockService farmProductStockService;
- private final IProcessService processService;
-
+// private final IProcessService processService;
+ private final IProcessInvService processInvService;
/**
* 详情
*/
@@ -124,18 +127,32 @@
}
/**
- * 新增或修改 库存损耗记录表
+ * 新增或修改 库存损耗记录表(加工产品)
*/
@PostMapping("/submitProcess")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "新增或修改", notes = "传入sale")
public R submitProcess(@Valid @RequestBody InventoryVO inventory) {
- boolean res = processService.stockCompare(inventory.getSaleNum(),inventory.getProid());
+// boolean res = processService.stockCompare(inventory.getSaleNum(),inventory.getProid());
+// if (!res){
+// throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
+// }else {
+// //库存充足，减去相应库存
+// processService.stockReduce(inventory.getSaleNum(),inventory.getProid());
+// }
+// return R.status(inventoryService.saveOrUpdate(inventory));
+ boolean res = processInvService.stockCompare(inventory.getSaleNum(),inventory.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- processService.stockReduce(inventory.getSaleNum(),inventory.getProid());
+ processInvService.stockReduce(inventory.getSaleNum(),inventory.getProid());
+ //更新updateTIme 和 updateUser
+ ProcessInv processInv = new ProcessInv();
+ processInv.setUpdateUser(inventory.getCreateUser());
+ processInv.setUpdateTime(new Date());
+ processInv.setId(Long.parseLong(inventory.getProid()));
+ processInvService.updateById(processInv);
}
return R.status(inventoryService.saveOrUpdate(inventory));
}
--
Gitblit v1.9.3