海运空运导出装柜颜色调整

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentAirLoadExcelExportListener.java

@@ -498,11 +498,11 @@ public class ShipmentAirLoadExcelExportListener {
                         preloadDto.setMergePkgQua(totalMergeQuality);
                         preloadDto.setWorth(totalWorth);
                         preloadDtoList.add(preloadDto);
-                        int andIncrement = colorRowNum.getAndIncrement();
-                        colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-                        colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-                        colorRowList.add(andIncrement);
-                        colorRowList2.add(andIncrement);
+//                        int andIncrement = colorRowNum.getAndIncrement();
+//                        colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+//                        colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+//                        colorRowList.add(andIncrement);
+//                        colorRowList2.add(andIncrement);
                         allTotalNum = allTotalNum + totalNum;
                         allTotalVolume = allTotalVolume.add(totalVolume);
                         allTotalWeight = allTotalWeight.add(totalWeight);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -409,13 +409,14 @@ public class ShipmentLoadExcelExportListener2 {
                                     }
                                 }
                             }
-                            int andIncrement = colorRowNum.getAndIncrement();
-                            colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-                            colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
-
-                            colorRowList.add(andIncrement);
-                            colorRowList2.add(andIncrement);
-                            colorRowNum.getAndAdd(1);
+//                            int andIncrement = colorRowNum.getAndIncrement();
+//                            colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+//                            colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
+//
+//                            colorRowList.add(andIncrement);
+//                            colorRowList2.add(andIncrement);
+//                            colorRowNum.getAndAdd(1);
+                            colorRowNum.getAndAdd(2);
                             LoadDto preloadDto = new LoadDto();
                             preloadDto.setId("TOTAL");
                             preloadDto.setSumNum(totalNum);