unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/service/impl/BusinessRpReportServiceImpl.java

@@ -170,25 +170,28 @@ public class BusinessRpReportServiceImpl extends ServiceImpl<BusinessRpReportMap
                 newGrain.setName("grainVarietyName");
 
                 newGrain.setColumns(new ArrayList<>());
+
+                // Add columns only if there's corresponding quantity
+                if (report.getOutboundQuantity() != null) {
+                    TableColumn outboundColumn = new TableColumn();
+                    outboundColumn.setTitle("轮出数量");
+                    outboundColumn.setAlign("center");
+                    // Use dynamic indexing if required
+                    outboundColumn.setDataIndex(report.getGrainVarietyId()+"outboundQuantity");
+                    newGrain.getColumns().add(outboundColumn);
+                }
+                if (report.getInboundQuantity() != null) {
+                    TableColumn inboundColumn = new TableColumn();
+                    inboundColumn.setTitle("轮入数量");
+                    inboundColumn.setAlign("center");
+                    inboundColumn.setDataIndex(report.getGrainVarietyId()+"inboundQuantity");
+                    newGrain.getColumns().add(inboundColumn);
+                }
+
                 return newGrain;
             });
 
-            // Add columns only if there's corresponding quantity
-            if (report.getOutboundQuantity() != null) {
-                TableColumn outboundColumn = new TableColumn();
-                outboundColumn.setTitle("轮出数量");
-                outboundColumn.setAlign("center");
-                // Use dynamic indexing if required
-                outboundColumn.setDataIndex(report.getGrainVarietyId()+"outboundQuantity");
-                grain.getColumns().add(outboundColumn);
-            }
-            if (report.getInboundQuantity() != null) {
-                TableColumn inboundColumn = new TableColumn();
-                inboundColumn.setTitle("轮入数量");
-                inboundColumn.setAlign("center");
-                inboundColumn.setDataIndex(report.getGrainVarietyId()+"inboundQuantity");
-                grain.getColumns().add(inboundColumn);
-            }
+
            sumByGrain = sumByOrgId.computeIfAbsent(orgId, k -> new HashMap<>());
 
             // 更新或设置非数量字段，确保使用最新的值