Skip to content

J
jiedao-api-boot-master
Commit a166b83d authored by honghy's avatar honghy Committed by wux
Browse files
Options

空运/海运已装单添加底色

parent bb6f26db
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentAirLoadExcelExportListener.java
View file @ a166b83d
...@@ -498,11 +498,11 @@ public class ShipmentAirLoadExcelExportListener { ...@@ -498,11 +498,11 @@ public class ShipmentAirLoadExcelExportListener {
preloadDto.setMergePkgQua(totalMergeQuality); preloadDto.setMergePkgQua(totalMergeQuality);
preloadDto.setWorth(totalWorth); preloadDto.setWorth(totalWorth);
preloadDtoList.add(preloadDto); preloadDtoList.add(preloadDto);
// int andIncrement = colorRowNum.getAndIncrement(); int andIncrement = colorRowNum.getAndIncrement();
// colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index)); colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
// colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index)); colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
// colorRowList.add(andIncrement); colorRowList.add(andIncrement);
// colorRowList2.add(andIncrement); colorRowList2.add(andIncrement);
allTotalNum = allTotalNum + totalNum; allTotalNum = allTotalNum + totalNum;
allTotalVolume = allTotalVolume.add(totalVolume); allTotalVolume = allTotalVolume.add(totalVolume);
allTotalWeight = allTotalWeight.add(totalWeight); allTotalWeight = allTotalWeight.add(totalWeight);
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java
View file @ a166b83d
...@@ -409,14 +409,13 @@ public class ShipmentLoadExcelExportListener2 { ...@@ -409,14 +409,13 @@ public class ShipmentLoadExcelExportListener2 {
} }
} }
} }
// int andIncrement = colorRowNum.getAndIncrement(); int andIncrement = colorRowNum.getAndIncrement();
// colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index)); // colorMap2.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
// colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index)); // colorMap.put(String.valueOf(andIncrement),Integer.valueOf(IndexedColors.YELLOW.index));
// //
// colorRowList.add(andIncrement); // colorRowList.add(andIncrement);
// colorRowList2.add(andIncrement); // colorRowList2.add(andIncrement);
// colorRowNum.getAndAdd(1); colorRowNum.getAndAdd(1);
colorRowNum.getAndAdd(2);
LoadDto preloadDto = new LoadDto(); LoadDto preloadDto = new LoadDto();
preloadDto.setId("TOTAL"); preloadDto.setId("TOTAL");
preloadDto.setSumNum(totalNum); preloadDto.setSumNum(totalNum);
...@@ -437,6 +436,10 @@ public class ShipmentLoadExcelExportListener2 { ...@@ -437,6 +436,10 @@ public class ShipmentLoadExcelExportListener2 {
preloadDto1.setSumVolume(allTotalVolume); preloadDto1.setSumVolume(allTotalVolume);
preloadDto1.setSumWeight(allTotalWeight); preloadDto1.setSumWeight(allTotalWeight);
preloadDto1.setWorth(allTotalWorth); preloadDto1.setWorth(allTotalWorth);
colorMap2.put(String.valueOf(andIncrement+1),Integer.valueOf(IndexedColors.YELLOW.index));
colorMap.put(String.valueOf(andIncrement+1),Integer.valueOf(IndexedColors.YELLOW.index));
colorRowList.add(andIncrement+1);
colorRowList2.add(andIncrement+1);
list.add(preloadDto1); list.add(preloadDto1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment