出入库记录删除回滚逻辑修改

guoshilong

2022-09-15 fa326e87de2805d8b66b301daee596b1d959e430

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

@@ -28,8 +28,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.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;
import org.springblade.modules.soldrecord.entity.Soldrecord;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
@@ -44,7 +46,9 @@
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;

/**
 * 出入库记录 控制器
@@ -101,8 +105,13 @@
         String s = specs + dic1 + "/" + dic2;
         //出库
         if (pages.getRecords().get(i).getStockType1() == 0) {
            String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
            pages.getRecords().get(i).setCount(count);
            if (pages.getRecords().get(i).getType1().equals("4")){
               String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
               pages.getRecords().get(i).setCount(count);
            }else {
               String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
               pages.getRecords().get(i).setCount(count);
            }
         } else {
            String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
            pages.getRecords().get(i).setCount(count);
@@ -140,12 +149,16 @@
   @ApiOperation(value = "新增", notes = "传入stockrecord")
   public R save(@Valid @RequestBody StockrecordVO stockrecord) {
      Integer stockType1 = stockrecord.getStockType1();
      //0出库 1入库
      //出库
      if (stockType1 == 0) {
         //库存量
         Integer num = stockrecord.getNum();
         //出库量
         Integer amount1 = stockrecord.getAmount1();
         //规格
         String specs1 = stockrecord.getSpecs1();
         int spe = Integer.parseInt(specs1);
         //当前总量
         int i = num - amount1;
         Stock stock = new Stock();
@@ -156,38 +169,38 @@
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = amount1 * 0.001;
            v = amount1* spe * 0.001;
         }
         //斤
         if (specsValue1 == 1) {
            v = amount1 * 0.5;
            v = amount1* spe * 0.5;
         }
         //公斤
         if (specsValue1 == 2) {
            v = amount1;
            v = amount1* spe;
         }
         //吨
         if (specsValue1 == 3) {
            v = amount1 * 1000;
            v = amount1 * spe * 1000;
         }
         //毫升
         if (specsValue1 == 4) {
            //毫升换成升
            double s = amount1 * 0.001;
            double s = amount1* spe * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         if (specsValue1 == 5) {
            v = amount1;
            v = amount1* spe;
         }
         stockrecord.setCensus(v);
         if (i == 0) {
            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);
@@ -200,28 +213,39 @@
         soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
         soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
         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());
            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.setCensus(v);
            soldr.setDeptId(stockrecord.getDeptId());
            //已出库农资数量
            Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
            if (null != detail) {
               Integer amount11 = detail.getAmount1();
               soldrecordService.updateSold(amount11 + amount1, detail.getSid());
            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();
               Double census = Double.parseDouble(amount12);
               String sid = maps.get(0).get("sid").toString();
               Long si=Long.valueOf(sid);
               soldrecordService.updateSold(amount11 + amount1, si,census+v);
            } else {
               soldrService.save(soldr);
            }
            //已出库农资
            soldrecordService.save(soldrecord);
            //填充stock_record表中的srId
            stockrecord.setSrId(soldrecord.getId());
            stockrecordService.updateById(stockrecord);
            soldrService.cancelDel(soldr.getId());
         }
      }
      //入库
@@ -230,6 +254,8 @@
         Integer num = stockrecord.getNum();
         //入库量
         Integer amount1 = stockrecord.getAmount1();
         String specs1 = stockrecord.getSpecs1();
         int spe=Integer.parseInt(specs1);
         //当前总量
         int i = num + amount1;
         Stock stock = new Stock();
@@ -242,30 +268,30 @@
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = amount1 * 0.001;
            v = amount1*spe * 0.001;
         }
         //斤
         if (specsValue1 == 1) {
            v = amount1 * 0.5;
            v = amount1*spe * 0.5;
         }
         //公斤
         if (specsValue1 == 2) {
            v = amount1;
            v = amount1*spe;
         }
         //吨
         if (specsValue1 == 3) {
            v = amount1 * 1000;
            v = amount1*spe * 1000;
         }
         //毫升
         if (specsValue1 == 4) {
            //毫升换成升
            double s = amount1 * 0.001;
            double s = amount1*spe * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         if (specsValue1 == 5) {
            v = amount1;
            v = amount1*spe;
         }
         stockrecord.setCensus(v);
      }
@@ -300,6 +326,38 @@
   @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) {
         if (stockRecord.getType1().equals("4")){ //如果是农资退回
            Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
            Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(), soldrecord.getSpecs1(), soldrecord.getSpecsVal1(), soldrecord.getSpecsVal2(), soldrecord.getSid(), "0");
            if (stock.getAmount()<stockRecord.getAmount1()){//库存数量比出入库记录表数量少  没那么多库存补
               throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
            }else {
               stock.setAmount(stock.getAmount() - stockRecord.getAmount1());
               soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
               Integer sub = soldr.getAmount1() + stockRecord.getAmount1();
               soldr.setAmount1(sub);
               soldrService.updateById(soldr);
            }
         }else {//其他出库类型
            stock.setAmount(stock.getAmount() + stockRecord.getAmount1());
         }
      }
      else {
         //1 入库    删除记录后原库存减少
         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)));
   }