大屏市场流通增加查询条件

xiebin

2022-08-09 01b846921613edfbccfb4f28a64db7af5ea78b07

 src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java

@@ -32,9 +32,13 @@
import org.springblade.modules.InventoryLoss.entity.Inventory;
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;

/**
 * 库存损耗记录表 控制器
@@ -50,7 +54,8 @@

   private final InventoryService inventoryService;
   private final FarmProductStockService farmProductStockService;

//   private final IProcessService processService;
   private final IProcessInvService processInvService;
   /**
    * 详情
    */
@@ -110,17 +115,47 @@
   @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));
   }

   /**
    * 新增或修改 库存损耗记录表(加工产品)
    */
   @PostMapping("/submitProcess")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "新增或修改", notes = "传入sale")
   public R submitProcess(@Valid @RequestBody InventoryVO inventory) {
//      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 {
         //库存充足，减去相应库存
         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));
   }

   /**
    * 删除 库存损耗记录表