From a04d388d2f0912eb56920f4ca83d405a6e007c4f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 10:14:27 +0800
Subject: [PATCH] 修改farmplant类 per、plantNumber、plantSpacing的更新策略为IGNORED
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 86bc7fd..920438d 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -28,6 +28,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.service.FarmProductStockService;
import org.springblade.modules.InventoryLoss.entity.Inventory;
import org.springblade.modules.InventoryLoss.service.InventoryService;
@@ -36,6 +37,7 @@
import org.springblade.modules.processInv.entity.ProcessInv;
import org.springblade.modules.processInv.service.IProcessInvService;
import org.springblade.modules.processInv.vo.ProcessInvVO;
+import org.springblade.modules.sale.entity.Sale;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -62,7 +64,7 @@
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入sale")
+ @ApiOperation(value = "详情", notes = "传入inventory")
public R<Inventory> detail(Inventory inventory) {
Inventory detail = inventoryService.getOne(Condition.getQueryWrapper(inventory));
return R.data(detail);
@@ -73,7 +75,7 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入sale")
+ @ApiOperation(value = "分页", notes = "传入inventory")
public R<IPage<Inventory>> list(Inventory inventory, Query query) {
IPage<Inventory> pages = inventoryService.page(Condition.getPage(query), Condition.getQueryWrapper(inventory));
return R.data(pages);
@@ -84,7 +86,7 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入sale")
+ @ApiOperation(value = "分页", notes = "传入inventory")
public R<IPage<InventoryVO>> page(InventoryVO inventory, Query query) {
IPage<InventoryVO> pages = inventoryService.selectSalePage(Condition.getPage(query), inventory);
return R.data(pages);
@@ -95,7 +97,7 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入sale")
+ @ApiOperation(value = "新增", notes = "传入inventory")
public R save(@Valid @RequestBody Inventory inventory) {
return R.status(inventoryService.save(inventory));
}
@@ -105,7 +107,7 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入sale")
+ @ApiOperation(value = "修改", notes = "传入inventory")
public R update(@Valid @RequestBody Inventory inventory) {
return R.status(inventoryService.updateById(inventory));
}
@@ -115,7 +117,7 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入sale")
+ @ApiOperation(value = "新增或修改", notes = "传入inventory")
public R submit(@Valid @RequestBody InventoryVO inventory) {
boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getProid());
if (!res){
@@ -124,6 +126,7 @@
//库存充足，减去相应库存
farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
}
+ inventory.setProdId(inventory.getProid());
return R.status(inventoryService.saveOrUpdate(inventory));
}
@@ -132,7 +135,7 @@
*/
@PostMapping("/submitProcess")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "新增或修改", notes = "传入sale")
+ @ApiOperation(value = "新增或修改", notes = "传入inventory")
public R submitProcess(@Valid @RequestBody InventoryVO inventory) {
// boolean res = processService.stockCompare(inventory.getSaleNum(),inventory.getProid());
// if (!res){
@@ -157,6 +160,7 @@
inventory.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
+ inventory.setProdId(inventory.getProid());
return R.status(inventoryService.saveOrUpdate(inventory));
}
@@ -167,6 +171,18 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ Inventory inventory = inventoryService.getById(Long.parseLong(ids));
+ if (inventory.getType() == 0){
+ FarmProductStock farmProductStock = farmProductStockService.getById(inventory.getProdId());
+ Double weight = Double.parseDouble(farmProductStock.getWeight())+inventory.getSaleNum();
+ farmProductStock.setWeight(weight.toString());
+ farmProductStockService.updateById(farmProductStock);
+ }else {
+ ProcessInv inv = processInvService.findById(inventory.getProdId());
+ Double weight = inv.getProductInventoryNum()+inventory.getSaleNum();
+ inv.setProductInventoryNum(weight);
+ processInvService.updateById(inv);
+ }
return R.status(inventoryService.deleteLogic(Func.toLongList(ids)));
}
--
Gitblit v1.9.3