|
|
|
@ -1145,7 +1145,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* Alpha/硬标场景按客户名称、客户地址、收货地址是否包含 Spain/España 决定是否显示 Loading No. |
|
|
|
* Alpha/硬标场景按目的地是否包含 Spain/España 决定是否显示 Loading No. |
|
|
|
*/ |
|
|
|
private String resolveLoadingNoTemplateValue(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) { |
|
|
|
String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo()) |
|
|
|
@ -2987,7 +2987,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { |
|
|
|
} |
|
|
|
Integer palletQty = palletQtyMap.get(palletSeqNo); |
|
|
|
// 第一列展示托号(pallet_no),按托盘首行显示,后续行留空再做按托合并 |
|
|
|
eorder.put("seq_no", !hasPalletData?(showPalletQty ? palletNo : ""):boxNo); |
|
|
|
eorder.put("seq_no", hasPalletData?(showPalletQty ? palletNo : ""):boxNo); |
|
|
|
eorder.put("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : ""); |
|
|
|
eorder.put("volume", isFirstRow ? volume : ""); |
|
|
|
eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : ""); |
|
|
|
|