#

lty

4 天以前 dea586adf232c722e8d2dfa833c3d7711a1019df

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 日志统计控制器层
@@ -52,7 +53,7 @@

   // 导出
   @RequestMapping(value = "/viewStockUseExport.action")
   @ManagerAuth(memo = "库位使用统计导出")
   @ManagerAuth(memo = "response.export_loc_usage")
   public R viewStockUseExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
@@ -81,7 +82,7 @@

   // 导出
   @RequestMapping(value = "/viewStayTimeExport.action")
   @ManagerAuth(memo = "库存滞留统计导出")
   @ManagerAuth(memo = "response.export_stock_stay")
   public R viewStayTimeExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
@@ -91,30 +92,89 @@
   //-----------------库存MAP图--------------------------------------
   @RequestMapping("/viewLocMapList/rows.action")
   public R queryViewLocMapRows(){
      return R.ok().add(reportQueryMapper.getViewLocRowTotal());
      R r = R.ok();
      r.put("data", reportQueryMapper.getViewLocRowTotal());
      return r;
   }
   @RequestMapping("/viewLocMapList/layers.action")
   public R queryViewLocMapLevs(){
      R r = R.ok();
      r.put("data", reportQueryMapper.getViewLocLevTotal());
      return r;
   }

   @RequestMapping("/viewLocMapList.action")
   public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
      // 获取排级数据
      // 表格标题：列 ===>> 升序
      List<String> bays = reportQueryMapper.getViewLocBayCount(row);
      // ！表格第一列放层级数
      bays.add(0, "");
      // 表格行：层 ====>> 倒序
      List<String> levs = reportQueryMapper.getViewLocLevCount(row);
      List<Map<String, Object>> body = new ArrayList<>();
      for (String lev : levs){
         // 获取层级数据
         List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
         // ！表格第一列放层级数
         dtos.add(0, new ViewLocMapDto(null ,null, lev));
         Map<String, Object> map = new HashMap<>();
         map.put("loc", dtos);
         body.add(map);
      }
   public R queryViewLocMapListByPages(
         @RequestParam(required = false, defaultValue = "0") Integer row,
         @RequestParam(required = false) Integer layer) {

      Map<String, Object> result = new HashMap<>();
      result.put("title", bays);
      List<String> title = new ArrayList<>();
      List<Map<String, Object>> body = new ArrayList<>();

      if (layer != null && layer > 0) {
         // ── 按层显示所有排 × 所有列 ───────────────────────────────

         // 1. 表头：所有 bay
         List<String> allBays = reportQueryMapper.getAllBays(); // 或生成 1 到 maxBay
         title.add(""); // 第一列放排号
         title.addAll(allBays);

         // 2. 获取该层所有库位
         List<ViewLocMapDto> locs = reportQueryMapper.getLocMapByLayer(layer);

         // 3. 按 row 分组（推荐用 Map 或 Stream 分组）
         Map<Integer, List<ViewLocMapDto>> rowMap = locs.stream()
               .collect(Collectors.groupingBy(ViewLocMapDto::getRow1));

         // 4. 遍历所有排，生成每一行
         List<Integer> allRows = reportQueryMapper.getAllRows();
         for (Integer currentRow : allRows) {
            List<ViewLocMapDto> rowData = rowMap.getOrDefault(currentRow, new ArrayList<>());

            // 按 bay 排序并补齐空位
            Map<Integer, ViewLocMapDto> bayMap = rowData.stream()
                  .collect(Collectors.toMap(ViewLocMapDto::getBay1, d -> d));

            List<ViewLocMapDto> line = new ArrayList<>();
            // 第一列：排号
            line.add(new ViewLocMapDto(null, null, String.valueOf(currentRow)));

            // 填充所有 bay
            for (String bayStr : allBays) {
               int bay = Integer.parseInt(bayStr);
               ViewLocMapDto dto = bayMap.get(bay);
               if (dto != null) {
                  line.add(dto);
               } else {
                  // 无库位 → 补空
                  line.add(new ViewLocMapDto(null, 0, null)); // 或自定义空状态
               }
            }

            Map<String, Object> map = new HashMap<>();
            map.put("loc", line);
            body.add(map);
         }
      }
      else {
         // ── 按排模式（原有逻辑） ─────────────────────
         title = reportQueryMapper.getViewLocBayCount(row);
         title.add(0, "");

         List<String> levs = reportQueryMapper.getViewLocLevCount(row);
         body = new ArrayList<>();

         for (String lev : levs) {
            List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
            dtos.add(0, new ViewLocMapDto(null, null, lev));
            Map<String, Object> map = new HashMap<>();
            map.put("loc", dtos);
            body.add(map);
         }
      }

      result.put("title", title);
      result.put("body", body);
      return R.ok(result);
   }
@@ -138,7 +198,7 @@

   //excel导出
   @RequestMapping("/viewInOutExport.action")
   @ManagerAuth(memo = "站点日入出库次数统计导出")
   @ManagerAuth(memo = "response.export_station_io_count")
   public R viewInOutExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
@@ -213,7 +273,7 @@

   //excel导出
   @RequestMapping("/viewWorkInExport.action")
   @ManagerAuth(memo = "日入库明细统计导出")
   @ManagerAuth(memo = "response.export_daily_inbound_detail")
   public R viewWorkInExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      @SuppressWarnings("unchecked")
@@ -236,7 +296,7 @@

   //excel导出
   @RequestMapping("/viewWorkOutExport.action")
   @ManagerAuth(memo = "日出库明细统计导出")
   @ManagerAuth(memo = "response.export_daily_outbound_detail")
   public R viewWorkOutExport(@RequestBody JSONObject param){
      List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
      @SuppressWarnings("unchecked")