农事查询修改

Administrator

2022-05-17 23fad1fda60cc9a2d9743ffb7989b20261a37cf7

 src/main/java/org/springblade/modules/stock/controller/StockController.java

@@ -27,6 +27,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.stockrecord.entity.Stockrecord;
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +38,8 @@
import org.springblade.modules.stock.vo.StockVO;
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.List;

/**
 * 农资库存表 控制器
@@ -48,7 +54,7 @@
public class StockController extends BladeController {

   private final IStockService stockService;

   private final IStockrecordService stockrecordService;
   /**
    * 详情
    */
@@ -78,7 +84,15 @@
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入stock")
   public R<IPage<StockVO>> page(StockVO stock, Query query) {
      IPage<StockVO> pages = stockService.selectStockPage(Condition.getPage(query), stock);
      IPage<StockVO> pages = stockService.selectLists(Condition.getPage(query), stock);
      for (int i=0;i<pages.getRecords().size();i++){
         String specs = pages.getRecords().get(i).getSpecs();
         String dic1 = pages.getRecords().get(i).getDic1();
         String dic2 = pages.getRecords().get(i).getDic2();
         String s = specs+dic1 +"/"+ dic2;
         pages.getRecords().get(i).setSpn(s);

      }
      return R.data(pages);
   }

@@ -89,6 +103,25 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入stock")
   public R save(@Valid @RequestBody Stock stock) {
      stock.setState("0");
      stock.setSp1("stockSpecs1");
      stock.setSp2("stockSpecs2");
      //农资记录表
      Stockrecord stockrecord =new Stockrecord();
      //农资ID
      stockrecord.setStockId1(stock.getStockId());
      stockrecord.setAmount1(stock.getAmount());
      stockrecord.setTime1(stock.getTime());
      stockrecord.setType1(stock.getType());
      stockrecord.setStockType1(1);
      stockrecord.setPicture1(stock.getPicture());
      stockrecord.setRemarks1(stock.getRemarks());
      stockrecord.setSpecs1(stock.getSpecs());
      stockrecord.setSpecsVal1(stock.getSpecsValue1());
      stockrecord.setSpecsVal2(stock.getSpecsValue2());
      stockrecord.setSp1("stockSpecs1");
      stockrecord.setSp2("stockSpecs2");
      stockrecordService.save(stockrecord);
      return R.status(stockService.save(stock));
   }

@@ -112,7 +145,7 @@
      return R.status(stockService.saveOrUpdate(stock));
   }

	

   /**
    * 删除 农资库存表
    */
@@ -123,5 +156,5 @@
      return R.status(stockService.deleteLogic(Func.toLongList(ids)));
   }

	

}