1、大屏首页接口修复，解决double类型相加精度问题

zengh

2022-08-01 d95f6551e8214d69cd0fd511ec693641eb61ba16

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

@@ -21,12 +21,22 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.validation.Valid;

import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
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;
import org.springblade.modules.stock.service.IStockService;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +44,9 @@
import org.springblade.modules.stockrecord.vo.StockrecordVO;
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springblade.core.boot.ctrl.BladeController;

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

/**
 * 出入库记录 控制器
@@ -48,6 +61,10 @@
public class StockrecordController extends BladeController {

   private final IStockrecordService stockrecordService;
   private final IStockService stockService;
   private final IDictBizService dictService;
   private final ISoldrecordService soldrecordService;
   private final ISoldrService soldrService;

   /**
    * 详情
@@ -78,7 +95,42 @@
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入stockrecord")
   public R<IPage<StockrecordVO>> page(StockrecordVO stockrecord, Query query) {
      IPage<StockrecordVO> pages = stockrecordService.selectStockrecordPage(Condition.getPage(query), stockrecord);
      IPage<StockrecordVO> pages = stockrecordService.seletStockRecordList(Condition.getPage(query), stockrecord);
      for (int i = 0; i < pages.getRecords().size(); i++) {
         String specs = pages.getRecords().get(i).getSpecs1();
         String dic1 = pages.getRecords().get(i).getDic1();
         String dic2 = pages.getRecords().get(i).getDic2();
         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);
         } else {
            String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
            pages.getRecords().get(i).setCount(count);
         }
         pages.getRecords().get(i).setSpn(s);
         //获取农资出入库类型 0：出库 1：入库
         Integer stockType1 = pages.getRecords().get(i).getStockType1();
         String type1 = pages.getRecords().get(i).getType1();
         if (stockType1 == 0) {
            List<DictBiz> tree = dictService.getList("stockPurchase1");
            for (int j = 0; j < tree.size(); j++) {
               if (tree.get(j).getDictKey().equals(type1)) {
                  pages.getRecords().get(i).setType1(tree.get(j).getDictValue());
               }
            }

         } else {
            List<DictBiz> tree = dictService.getList("stockPurchase");
            for (int j = 0; j < tree.size(); j++) {
               if (tree.get(j).getDictKey().equals(type1)) {
                  pages.getRecords().get(i).setType1(tree.get(j).getDictValue());
               }
            }
         }

      }
      return R.data(pages);
   }

@@ -88,7 +140,148 @@
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入stockrecord")
   public R save(@Valid @RequestBody Stockrecord stockrecord) {
   public R save(@Valid @RequestBody StockrecordVO stockrecord) {
      Integer stockType1 = stockrecord.getStockType1();
      //出库
      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();
         stock.setId(stockrecord.getSid());
         stock.setAmount(i);
         //统计公斤
         Integer specsValue1 = stockrecord.getSpecsVal1();
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = amount1* spe * 0.001;
         }
         //斤
         if (specsValue1 == 1) {
            v = amount1* spe * 0.5;
         }
         //公斤
         if (specsValue1 == 2) {
            v = amount1* spe;
         }
         //吨
         if (specsValue1 == 3) {
            v = amount1 * spe * 1000;
         }
         //毫升
         if (specsValue1 == 4) {
            //毫升换成升
            double s = amount1* spe * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         if (specsValue1 == 5) {
            v = amount1* spe;
         }
         stockrecord.setCensus(v);
         if (i == 0) {
            stock.setState("1");
            stockService.UpdaeAmountc(stock);
            //同时删除所有农资记录
            soldrecordService.delc(stockrecord.getStockId1());
            soldrService.del(stockrecord.getSid());
         } else {
            stock.setState("0");
            stockService.UpdaeAmountc(stock);
         }
         //已出库农资记录
         Soldrecord soldrecord = new Soldrecord();
         soldrecord.setStockId1(stockrecord.getStockId1());
         soldrecord.setAmount1(amount1);
         soldrecord.setSpecs1(stockrecord.getSpecs1());
         soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
         soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
         soldrecord.setType(stockrecord.getType1());
         soldrecord.setSid(stockrecord.getSid());
         String type1 = stockrecord.getType1();
         if (type1.equals("0")) {
            //已出库农资数量记录
            Soldr soldr = new Soldr();
            soldr.setSid(stockrecord.getSid());
            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);
            //已出库农资数量
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
            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);
         }
      }
      //入库
      else {
         //库存量
         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();
         stock.setId(stockrecord.getSid());
         stock.setAmount(i);
         stock.setState("0");
         stockService.UpdaeAmountc(stock);
         //统计公斤
         Integer specsValue1 = stockrecord.getSpecsVal1();
         double v = 0;
         //克
         if (specsValue1 == 0) {
            v = amount1*spe * 0.001;
         }
         //斤
         if (specsValue1 == 1) {
            v = amount1*spe * 0.5;
         }
         //公斤
         if (specsValue1 == 2) {
            v = amount1*spe;
         }
         //吨
         if (specsValue1 == 3) {
            v = amount1*spe * 1000;
         }
         //毫升
         if (specsValue1 == 4) {
            //毫升换成升
            double s = amount1*spe * 0.001;
            //升换成公斤
            v = s;
         }
         //升
         if (specsValue1 == 5) {
            v = amount1*spe;
         }
         stockrecord.setCensus(v);
      }
      return R.status(stockrecordService.save(stockrecord));
   }

@@ -112,7 +305,7 @@
      return R.status(stockrecordService.saveOrUpdate(stockrecord));
   }

	

   /**
    * 删除 出入库记录
    */
@@ -120,8 +313,21 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
//      Stockrecord stockRecord = stockrecordService.getById(ids);
//      Stock stock = stockService.getById(stockRecord.getSid());
//      //对库存表操作
//      //判断stockType1  0出库  1入库
//      if (stockRecord.getStockType1() == 0){
//         //0出库     删除记录后原库存添加
//         stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
//      }else {
//         //1 入库    删除记录后原库存减少
//         stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
//      }
//      stockService.UpdaeAmountc(stock);
//      //对已出库表操作   soldr出库数量记录表已出库农资减少     soldrecord出库记录表的数据也要删除
      return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));
   }

	

}