农资管理

tangzy

2022-05-30 0f51855b9046632aef8b517eb35b9116e5ea8b72

 src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java

@@ -28,6 +28,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.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldrecord.entity.Soldrecord;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
@@ -60,6 +62,8 @@
   private final IStockService stockService;
   private final IDictBizService dictService;
   private final ISoldrecordService soldrecordService;
   private final ISoldrService soldrService;

   /**
    * 详情
    */
@@ -145,11 +149,14 @@
         //当前总量
         int i = num - amount1;
         Stock stock = new Stock();
         stock.setStockId(stockrecord.getStockId1());
         stock.setId(stockrecord.getSid());
         stock.setAmount(i);
         if (i == 0) {
            stock.setState("1");
            stockService.UpdaeAmountc(stock);
            //同时删除所有农资记录
            soldrecordService.delc(stockrecord.getStockId1());
            soldrService.del(stockrecord.getSid());
         } else {
            stock.setState("0");
            stockService.UpdaeAmountc(stock);
@@ -161,7 +168,30 @@
         soldrecord.setSpecs1(stockrecord.getSpecs1());
         soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
         soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
         soldrecordService.save(soldrecord);
         soldrecord.setType(stockrecord.getType1());
         String type1 = stockrecord.getType1();
         if (type1.equals("0")) {
            //已出库农资数量记录
            Soldr soldr = new Soldr();
            soldr.setSid(stockrecord.getSid());
            soldr.setStockId1(stockrecord.getStockId1());
            soldr.setStockId1(stockrecord.getStockId1());
            soldr.setAmount1(amount1);
            soldr.setSpecs1(stockrecord.getSpecs1());
            soldr.setSpecsVal1(stockrecord.getSpecsVal1());
            soldr.setSpecsVal2(stockrecord.getSpecsVal2());
            soldr.setType(stockrecord.getType1());
            //已出库农资数量
            Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
            if (null != detail) {
               Integer amount11 = detail.getAmount1();
               soldrecordService.updateSold(amount11 + amount1, detail.getSid());
            } else {
               soldrService.save(soldr);
            }
            //已出库农资
            soldrecordService.save(soldrecord);
         }
      }
      //入库
      else {
@@ -172,7 +202,7 @@
         //当前总量
         int i = num + amount1;
         Stock stock = new Stock();
         stock.setStockId(stockrecord.getStockId1());
         stock.setId(stockrecord.getSid());
         stock.setAmount(i);
         stock.setState("0");
         stockService.UpdaeAmountc(stock);