保留农资退回记录，修复当农资库存为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;
@@ -39,6 +42,8 @@
import org.springblade.modules.soldr.vo.SoldrVO;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.*;

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

   /**
    * 详情
@@ -142,33 +148,116 @@
   }


   /**
    * 退回
    * @param num 数量
    * @param id 农资id
    * @param type
    * @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找到已出库农资表中对应的农资
         Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
         Integer amount1 = detail.getAmount1();
         soldrecordService.updateSold(amount1 - num, id);
         Double census = detail.getCensus();
         //统计公斤
         Integer specsValue1 = detail.getSpecsVal1();
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = num * 0.001;
         }
         //斤
         else if (specsValue1 == 1) {
            v = num * 0.5;
         }
         //公斤
         else if (specsValue1 == 2) {
            v = num;
         }
         //吨
         else if (specsValue1 == 3) {
            v = num * 1000;
         }
         //毫升
         else if (specsValue1 == 4) {
            //毫升换成升
            double s = num * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         else{
            v = num;
         }
         //更新已出库农资的数据
         soldrecordService.updateSold(amount1 - num, id,census-v);
         Stock stock = new Stock();
         stock.setId(id);
         //根据传过来的sid获取对应的库存表数据
         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("退回成功");
   }

@@ -192,7 +281,38 @@
         soldr.setSid(soldrVOs.getId());
         Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
         Integer amount1 = detail.getAmount1();
         soldrecordService.updateSold(amount1 - soldrVOs.getNum(), soldrVOs.getId());
         Double census = detail.getCensus();
         //统计公斤
         Integer specsValue1 = detail.getSpecsVal1();
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = soldrVOs.getNum() * 0.001;
         }
         //斤
         if (specsValue1 == 1) {
            v = soldrVOs.getNum() * 0.5;
         }
         //公斤
         if (specsValue1 == 2) {
            v = soldrVOs.getNum();
         }
         //吨
         if (specsValue1 == 3) {
            v = soldrVOs.getNum() * 1000;
         }
         //毫升
         if (specsValue1 == 4) {
            //毫升换成升
            double s = soldrVOs.getNum() * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         if (specsValue1 == 5) {
            v = soldrVOs.getNum();
         }
         soldrecordService.updateSold(amount1 - soldrVOs.getNum(), soldrVOs.getId(),census-v);
         Stock stock = new Stock();
         stock.setId(soldrVOs.getId());
         Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
@@ -203,4 +323,24 @@
      return R.success("退回成功");
   }

   /**
    * 已出农资列表
    *
    * @return
    */
   @GetMapping("/selectSol")
   public R selectSol(String farmId) {
      List<SoldrVO> soldrVOS = soldrService.selectSol(farmId);
      for (int i = 0; i < soldrVOS.size(); i++) {
         String specs1 = soldrVOS.get(i).getSpecs1();
         String dic1 = soldrVOS.get(i).getDic1();
         String dic2 = soldrVOS.get(i).getDic2();
         String agrname = soldrVOS.get(i).getAgrname();
         String s = agrname + specs1 + dic1 + "/" + dic2;
         soldrVOS.get(i).setSpn(s);
      }

      return R.data(soldrVOS);
   }

}