种养结束修改

Administrator

2022-05-30 0c90b05a7df664f8dcab2c4b330c07c7b80745a4

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

@@ -27,6 +27,8 @@
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.*;
@@ -52,7 +54,7 @@
public class StockController extends BladeController {

   private final IStockService stockService;
   private final IDictBizService dictService;
   private final IStockrecordService stockrecordService;
   /**
    * 详情
    */
@@ -85,10 +87,13 @@
      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();
         Integer amount = pages.getRecords().get(i).getAmount();
         Integer num=Integer.parseInt(specs);
         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);
         pages.getRecords().get(i).setCnum(num*amount);

      }
      return R.data(pages);
@@ -104,7 +109,25 @@
      stock.setState("0");
      stock.setSp1("stockSpecs1");
      stock.setSp2("stockSpecs2");
      return R.status(stockService.save(stock));
      boolean save = stockService.save(stock);
      //农资记录表
      Stockrecord stockrecord =new Stockrecord();
      //农资ID
      stockrecord.setSid(stock.getId());
      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(save);
   }

   /**