修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据

guoshilong

2022-08-06 1e159ffbf027d1c8a2de5a92ff257d3b02411415

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

@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldr.vo.SoldrVO;
@@ -322,18 +323,21 @@
      Stockrecord stockRecord = stockrecordService.getById(ids);
      //根据stockRecord中的库存记录id找到对应的库存数据
      Stock stock = stockService.getById(stockRecord.getSid());
      //根据stockRecord中的srId找到对应的已出库记录表的对应数据
      Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
      //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
      Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
      //对库存表操作
      //判断stockType1  0出库  1入库
      if (soldr.getAmount1()!=soldrecord.getAmount1()){
         throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
      }else {
      if (stockRecord.getStockType1() == 0){
         //0出库     删除记录后原库存添加
         stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
         //对已出库表操作   soldr出库数量记录表已出库农资减少     soldrecord出库记录表的数据也要删除
         //根据stockRecord中的srId找到对应的已出库记录表的对应数据
         Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
         //对soldrecord表逻辑删除
         soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
         //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
         Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
         Integer sub = soldr.getAmount1()-soldrecord.getAmount1();
         if (sub<=0){
            soldrService.dels(soldr.getId());
@@ -345,6 +349,7 @@
         //1 入库    删除记录后原库存减少
         stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
      }
      }
      stockService.UpdaeAmountc(stock);
      return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));
   }