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

guoshilong

2022-08-18 662d609f61c569782844c261a4c1d7535cae878b

 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);
@@ -144,6 +149,7 @@
   @ApiOperation(value = "新增", notes = "传入stockrecord")
   public R save(@Valid @RequestBody StockrecordVO stockrecord) {
      Integer stockType1 = stockrecord.getStockType1();
      //0出库 1入库
      //出库
      if (stockType1 == 0) {
         //库存量
@@ -193,8 +199,8 @@
            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);
@@ -209,7 +215,7 @@
         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());
@@ -222,8 +228,8 @@
            soldr.setCensus(v);
            soldr.setDeptId(stockrecord.getDeptId());
            //已出库农资数量
            List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
            if (maps.size()!=0) {
            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();