当全部退回时也会存储退回记录，查看出入库记录时当类型为农资退回时显示 + 而非-

guoshilong

2022-08-18 662d609f61c569782844c261a4c1d7535cae878b

当全部退回时也会存储退回记录，查看出入库记录时当类型为农资退回时显示 + 而非-

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

@@ -157,8 +157,14 @@
     */
    @PostMapping("/out")
    public R out(Integer num, Long id, Integer type,Long createUser,Long createDept) {
        double census1 = 0;
        //如果等于就修改并删除
        if (type == 0) {//退回数量等于库存数量
            Soldr soldr = new Soldr();
            soldr.setSid(id);
            //通过农资库存id找到已出库农资表中对应的农资
            Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
            census1 = detail.getCensus();
            Stock stock = new Stock();
            stock.setId(id);
            Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
@@ -207,6 +213,7 @@
            else{
                v = num;
            }
            census1 = v;
            //更新已出库农资的数据
            soldrecordService.updateSold(amount1 - num, id,census-v);
            Stock stock = new Stock();
@@ -218,46 +225,48 @@
            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);
        }

        Stock stock = new Stock();
        stock.setId(id);
        Stock detail1 = stockService.getOne(Condition.getQueryWrapper(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(census1);
        stockrecord.setDeptId(detail1.getDeptId());
        stockrecord.setSid(detail1.getId());
        stockrecord.setStockId1(detail1.getStockId());
        stockrecord.setTime1(new Date());
        stockrecord.setType1(soldrecord.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(0);
        stockrecord.setSrId(soldrecord.getId());
        stockrecordService.save(stockrecord);
        return R.success("退回成功");
    }


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

@@ -105,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);