生产终止功能添加，添加相关代码，补充报工删除代码

chenlu

2025-08-07 1ba245c2c69e7a70d44c950bb15bf92dcfaabdc5

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -165,15 +165,15 @@
        }


        List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        List<Map<String, Integer>> rowCount = new ArrayList<>();
        columns.forEach(col -> {
            getRowCount.forEach(row -> {
                Map<String, Integer> getRow = new HashMap<>();
                // { row: 0, col: 1, rowspan: 3, colspan: 0},
                getRow.put("row",  row.get("RowNum"));
                getRow.put("row", ((Number) row.get("RowNum")).intValue());
                getRow.put("col", col);
                getRow.put("rowspan", row.get("rowCount"));
                getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
                getRow.put("colspan", 0);
                rowCount.add(getRow);
            });
@@ -389,15 +389,15 @@
        map.put("title", uniqueList);


        List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        List<Map<String, Integer>> rowCount = new ArrayList<>();
        columns.forEach(col -> {
            getRowCount.forEach(row -> {
                Map<String, Integer> getRow = new HashMap<>();
                // { row: 0, col: 1, rowspan: 3, colspan: 0},
                getRow.put("row", row.get("RowNum"));
                getRow.put("row", ((Number) row.get("RowNum")).intValue());
                getRow.put("col", col);
                getRow.put("rowspan", row.get("rowCount"));
                getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
                getRow.put("colspan", 0);
                rowCount.add(getRow);
            });