修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据

guoshilong

2022-08-06 1e159ffbf027d1c8a2de5a92ff257d3b02411415

 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java

@@ -65,6 +65,15 @@
      return R.data(pages);
   }


   @GetMapping("/strainCount")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入farmProductStock")
   public R<IPage<FarmProductStockVO>> strainCount(FarmProductStockVO farmProductStock, Query query) {
      IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPagesCount(Condition.getPage(query), farmProductStock);
      return R.data(pages);
   }

   /**
    * 自定义分页
    */
@@ -74,6 +83,15 @@
   public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
      List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
      return R.data(pages);
   }

   @GetMapping("/getFarmProductStockByFarmIdAndStrainId")
   public R<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId,Integer strainId) {
      List<FarmProductStock> farmProductStockList = farmProductStockService.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
      if (farmProductStockList.size() == 0) {
         return R.data(null);
      }
      return R.data(farmProductStockList.get(0));
   }

   /**
@@ -180,14 +198,20 @@
      Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
      //统计当前库存加工产品
      Map<String, String> jgsum = null;
      map.put("sum",sum.get("sum"));
      if (sum != null){
         map.put("sum",sum.get("sum"));
         map.put("ncpNcl", sum.get("cssum"));
      }else{
         map.put("sum",0);
         map.put("ncpNcl",0);
      }
      map.put("jgsum",0);

      //农产品年产量统计
//      List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
//      double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");

      map.put("ncpNcl", sum.get("cssum"));


      //加工产品年产量统计
      map.put("jgNcl",0);
@@ -221,4 +245,10 @@
      return R.data(cssum);
   }

   @GetMapping("/getByLandId")
   public R getByLandId(String strainId,String landId){
      FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(strainId,landId);
      return R.data(farmProductStock);
   }

}