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

xiebin

2022-08-09 01b846921613edfbccfb4f28a64db7af5ea78b07

 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));
   }
@@ -183,8 +202,8 @@
    * 按行政区统计市场流通
    */
   @GetMapping("/selectMarketDistrict")
   public R selectMarketDistrict(String farmId) {
      return R.data(saleService.selectMarketDistrict(farmId));
   public R selectMarketDistrict(String farmId,String startTime,String endTime) {
      return R.data(saleService.selectMarketDistrict(farmId,startTime,endTime));
   }

}