海运已装单bug

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

@@ -209,8 +209,8 @@ public class ShipmentLoadExcelExportListener2 {
                             headList.add(list1);
 
                             headList.add(list1);headList.add(list1);headList.add(list1);
-                            //headList.add(list1);headList.add(list1);
-                            //headList.add(list1);headList.add(list1);
+//                            headList.add(list1);headList.add(list1);headList.add(list1);
+                            headList.add(list1);headList.add(list1);
 
                             List<LoadDto> list = new ArrayList<>();
 
@@ -295,7 +295,8 @@ public class ShipmentLoadExcelExportListener2 {
                                         preloadDto.setPackageType(packagingType);
                                     }
                                     preloadDto.setSumVolume(item.getWarehouseInInfoVO().getVolume());
-
+                                    preloadDto.setProdAttr(getAttrNameByIds(item.getProdAttrIds(),idNameMap));
+                                    preloadDto.setUsageIds(getUsageMsg(item.getUsageIds()));
                                     preloadDto.setSumWeight(item.getWarehouseInInfoVO().getWeight());
                                     if(orderInfo.getCustomsType()!=null){
                                         preloadDto.setCustomsType(DictFrameworkUtils.getDictDataFromCache("customs_type",orderInfo.getCustomsType()+"").getLabel());
@@ -379,6 +380,8 @@ public class ShipmentLoadExcelExportListener2 {
                                     .registerWriteHandler(new CustomLoadMergeStrategyNew(list,mergeCountList,10,2))
                                     .registerWriteHandler(new CustomLoadMergeStrategyNew(list,mergeCountList,11,2))
                                     .registerWriteHandler(new CustomLoadMergeStrategyNew(list,mergeCountList,12,1))
+                                    .registerWriteHandler(new CustomCellWriteHandler(colorRowList,13, colorMap))
+                                    .registerWriteHandler(new CustomCellWriteHandler(colorRowList,14, colorMap))
                                     .registerWriteHandler(new CustomLoadMergeStrategyNew(list,mergeCountList,17,1))
                                     .registerWriteHandler(new CustomLoadMergeStrategyNew(list,mergeCountList,18,2))
                                     .automaticMergeHead(true).head(headList).needHead(true).build();