Skip to content

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

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

parent cb465d0a
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 16 deletions
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentAirLoadExcelExportListener.java
View file @ c964d7c8
......@@ -282,16 +282,16 @@ public class ShipmentAirLoadExcelExportListener {
AirLoadDto preloadDto = new AirLoadDto();
preloadDto.setProdAttr(getAttrNameByIds(item.getProdAttrIds(),idNameMap));
// 当订单的报关方式=混合报关，订单的底色为蓝色，#0000FF
// 当订单的报关方式=自单代报，订单的底色为橙色， #FF7F00
// 当订单的报关方式=混合报关，订单的底色为蓝色，#00B0F0
// 当订单的报关方式=自单代报，订单的底色为橙色， #FF6600
// 当订单的商品包含了特性=危险品DG，订单的底色为黄色， #FFFF00
// 当订单的商品包含了特性=危险品DG&订单的报关方式=自单代报/混合报关，底色为绿色，#00FF00
// 当订单的商品包含了特性=危险品DG&订单的报关方式=自单代报/混合报关，底色为黄色，#FFC000
if(orderInfo.getCustomsType()!=null){
preloadDto.setCustomsType(DictFrameworkUtils.getDictDataFromCache("customs_type",orderInfo.getCustomsType()+"").getLabel());
if (CustomsTypeEnum.CUSTOMS_TYPE_3.getValue().equals(orderInfo.getCustomsType())){
Integer color = Integer.valueOf(IndexedColors.ROYAL_BLUE.index);
Integer color = Integer.valueOf(IndexedColors.SKY_BLUE.index);
if (prodAttrTag){
color=Integer.valueOf(IndexedColors.BRIGHT_GREEN.index);
color=Integer.valueOf(IndexedColors.GOLD.index);
}
int andIncrement2 = colorRowNum.get();
colorMap2.put(String.valueOf(andIncrement2),Integer.valueOf(color));
......@@ -301,7 +301,7 @@ public class ShipmentAirLoadExcelExportListener {
}else if (CustomsTypeEnum.CUSTOMS_TYPE_2.getValue().equals(orderInfo.getCustomsType())){
Integer color = Integer.valueOf(IndexedColors.ORANGE.index);
if (prodAttrTag){
color=Integer.valueOf(IndexedColors.BRIGHT_GREEN.index);
color=Integer.valueOf(IndexedColors.GOLD.index);
}
int andIncrement2 = colorRowNum.get();
colorMap2.put(String.valueOf(andIncrement2),Integer.valueOf(color));
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java
View file @ c964d7c8
......@@ -256,16 +256,16 @@ public class ShipmentLoadExcelExportListener2 {
LoadDto preloadDto = new LoadDto();
String attrNames = getAttrNameByIds(item.getProdAttrIds(), idNameMap);
preloadDto.setProdAttr(attrNames);
// 当订单的报关方式=混合报关，订单的底色为蓝色，#0000FF
// 当订单的报关方式=自单代报，订单的底色为橙色， #FF7F00
// 当订单的报关方式=混合报关，订单的底色为蓝色，#00B0F0
// 当订单的报关方式=自单代报，订单的底色为橙色， #FF6600
// 当订单的商品包含了特性=危险品DG，订单的底色为黄色， #FFFF00
// 当订单的商品包含了特性=危险品DG&订单的报关方式=自单代报/混合报关，底色为绿色，#00FF00
// 当订单的商品包含了特性=危险品DG&订单的报关方式=自单代报/混合报关，底色为黄色，#FFC000
if(orderInfo.getCustomsType()!=null){
preloadDto.setCustomsType(DictFrameworkUtils.getDictDataFromCache("customs_type",orderInfo.getCustomsType()+"").getLabel());
if (CustomsTypeEnum.CUSTOMS_TYPE_3.getValue().equals(orderInfo.getCustomsType())){
Integer color = Integer.valueOf(IndexedColors.ROYAL_BLUE.index);
Integer color = Integer.valueOf(IndexedColors.SKY_BLUE.index);
if (prodAttrTag){
color=Integer.valueOf(IndexedColors.BRIGHT_GREEN.index);
color=Integer.valueOf(IndexedColors.GOLD.index);
}
int andIncrement2 = colorRowNum.get();
colorMap2.put(String.valueOf(andIncrement2),Integer.valueOf(color));
......@@ -275,7 +275,7 @@ public class ShipmentLoadExcelExportListener2 {
}else if (CustomsTypeEnum.CUSTOMS_TYPE_2.getValue().equals(orderInfo.getCustomsType())){
Integer color = Integer.valueOf(IndexedColors.ORANGE.index);
if (prodAttrTag){
color=Integer.valueOf(IndexedColors.BRIGHT_GREEN.index);
color=Integer.valueOf(IndexedColors.GOLD.index);
}
int andIncrement2 = colorRowNum.get();
colorMap2.put(String.valueOf(andIncrement2),Integer.valueOf(color));
......@@ -437,10 +437,6 @@ public class ShipmentLoadExcelExportListener2 {
preloadDto1.setSumWeight(allTotalWeight);
preloadDto1.setWorth(allTotalWorth);
list.add(preloadDto1);
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);
}
WriteTable writeTable = EasyExcel.writerTable(i)
......
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