保留农资退回记录，修复当农资库存为1时出库再退回，农资库存数据有误

guoshilong

2022-08-18 fe371739b664c4e87914bcc7f3f550fec7e93121

 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;
@@ -45,6 +46,7 @@
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -142,6 +144,7 @@
   @ApiOperation(value = "新增", notes = "传入stockrecord")
   public R save(@Valid @RequestBody StockrecordVO stockrecord) {
      Integer stockType1 = stockrecord.getStockType1();
      //0出库 1入库
      //出库
      if (stockType1 == 0) {
         //库存量
@@ -191,8 +194,8 @@
            stock.setState("1");
            stockService.UpdaeAmountc(stock);
            //同时删除所有农资记录
            soldrecordService.delc(stockrecord.getStockId1());
            soldrService.del(stockrecord.getSid());
//            soldrecordService.delc(stockrecord.getStockId1());
//            soldrService.del(stockrecord.getSid());
         } else {
            stock.setState("0");
            stockService.UpdaeAmountc(stock);
@@ -207,7 +210,7 @@
         soldrecord.setType(stockrecord.getType1());
         soldrecord.setSid(stockrecord.getSid());
         String type1 = stockrecord.getType1();
         if (type1.equals("0")) {
         if (type1.equals("0")) { //0 采购入库
            //已出库农资数量记录
            Soldr soldr = new Soldr();
            soldr.setSid(stockrecord.getSid());
@@ -218,9 +221,10 @@
            soldr.setSpecsVal2(stockrecord.getSpecsVal2());
            soldr.setType(stockrecord.getType1());
            soldr.setCensus(v);
            soldr.setDeptId(stockrecord.getDeptId());
            //已出库农资数量
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
            if (maps.size()!=0) {
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid(),stockrecord.getDeptId());
            if (maps.size()!=0) {//已出库存表中有重复的
               String a = maps.get(0).get("amount1").toString();
               Integer amount11=Integer.parseInt(a);
               String amount12 = maps.get(0).get("amount1").toString();
@@ -233,6 +237,10 @@
            }
            //已出库农资
            soldrecordService.save(soldrecord);
            //填充stock_record表中的srId
            stockrecord.setSrId(soldrecord.getId());
            stockrecordService.updateById(stockrecord);
            soldrService.cancelDel(soldr.getId());
         }
      }
      //入库
@@ -313,15 +321,41 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      //根据出入库记录表找到对应的stockRecord
      Stockrecord stockRecord = stockrecordService.getById(ids);
      //根据stockRecord中的库存记录id找到对应的库存数据
      Stock stock = stockService.getById(stockRecord.getSid());
      //对库存表操作
      //判断stockType1  0出库  1入库
      if (stockRecord.getStockType1() == 0){
         //0出库     删除记录后原库存添加
         stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
      }else {
      if (stockRecord.getStockType1() == 0) {
         //根据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());
         if (soldr.getAmount1()<soldrecord.getAmount1()){//已出库农资的数量比出库记录表中的数量少，不能回退
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
         }else {
            //0出库     删除记录后原库存添加
            stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
            //对已出库表操作   soldr出库数量记录表已出库农资减少     soldrecord出库记录表的数据也要删除
            //对soldrecord表逻辑删除
            soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
            Integer sub = soldr.getAmount1() - soldrecord.getAmount1();
            if (sub <= 0) {
               soldrService.dels(soldr.getId());
            } else {
               soldr.setAmount1(sub);
               soldrService.updateById(soldr);
            }
         }
      }
      else {
         //1 入库    删除记录后原库存减少
         stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
         if (stockRecord.getAmount1() > stock.getAmount()) { //出入库记录表中的数量比库存的数量多不让回退
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
         } else {
            stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
         }
      }
      stockService.UpdaeAmountc(stock);
      return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));