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

guoshilong

2022-08-18 fe371739b664c4e87914bcc7f3f550fec7e93121

 src/main/java/org/springblade/modules/soldr/controller/SoldrController.java

@@ -29,9 +29,12 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.soldr.vo.SoldrVOs;
import org.springblade.modules.soldrecord.entity.Soldrecord;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
import org.springblade.modules.stock.service.IStockService;
import org.springblade.modules.stockrecord.entity.Stockrecord;
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,10 +43,7 @@
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.core.boot.ctrl.BladeController;

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

/**
 * 已出库存数量记录表 控制器
@@ -60,6 +60,7 @@
   private final ISoldrService soldrService;
   private final ISoldrecordService soldrecordService;
   private final IStockService stockService;
   private final IStockrecordService stockrecordService;

   /**
    * 详情
@@ -155,20 +156,21 @@
    * @return
    */
   @PostMapping("/out")
   public R out(Integer num, Long id, Integer type) {
   public R out(Integer num, Long id, Integer type,Long createUser,Long createDept) {
      //如果等于就修改并删除
      if (type == 0) {
      if (type == 0) {//退回数量等于库存数量
         Stock stock = new Stock();
         stock.setId(id);
         Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
         Integer amount = detail1.getAmount();
         stock.setAmount(amount + num);
         stock.setState("0");
         stockService.Updaet(stock);
         //删除
         soldrService.del(id);
      }
      //如果小于就修改
      else {
      else {//退回数量小于库存数量
         Soldr soldr = new Soldr();
         soldr.setSid(id);
         //通过农资库存id找到已出库农资表中对应的农资
@@ -213,9 +215,49 @@
         Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
         Integer amount = detail1.getAmount();
         stock.setAmount(amount + num);
         stock.setState("0");
         //更新库存表
         stockService.Updaet(stock);
         //更新已出库待使用农资记录表
         Soldrecord soldrecord = new Soldrecord();
         soldrecord.setAmount1(num);
         soldrecord.setSid(detail1.getId());
         soldrecord.setSpecs1(detail1.getSpecs());
         soldrecord.setSpecsVal1(detail1.getSpecsValue1());
         soldrecord.setSpecsVal2(detail1.getSpecsValue2());
         soldrecord.setType("4");
         soldrecord.setStockId1(detail1.getStockId());
         soldrecord.setIsDeleted(0);
         soldrecord.setStatus(1);
         soldrecord.setCreateTime(new Date());
         soldrecord.setUpdateTime(new Date());
         soldrecord.setCreateUser(createUser);
         soldrecord.setCreateDept(createDept);
         soldrecord.setUpdateUser(createUser);
         soldrecordService.save(soldrecord);
         //更新出入库记录表
         Stockrecord stockrecord = new Stockrecord();
         stockrecord.setAmount1(num);
         stockrecord.setCensus(v);
         stockrecord.setDeptId(detail1.getDeptId());
         stockrecord.setSid(detail1.getId());
         stockrecord.setStockId1(detail1.getStockId());
         stockrecord.setTime1(new Date());
         stockrecord.setType1(detail1.getType());//入库类型？
         stockrecord.setSpecs1(detail1.getSpecs());
         stockrecord.setSpecsVal1(detail1.getSpecsValue1());
         stockrecord.setSpecsVal2(detail1.getSpecsValue2());
         stockrecord.setCreateUser(createUser);
         stockrecord.setCreateDept(createDept);
         stockrecord.setCreateTime(new Date());
//         stockrecord.setUpdateUser();
         stockrecord.setStatus(1);
         stockrecord.setIsDeleted(0);
         stockrecord.setStockType1(1);//入库还是出库？暂定为入库
         stockrecord.setSrId(soldrecord.getId());
         stockrecordService.save(stockrecord);
      }

      return R.success("退回成功");
   }