Browse Source

Alpha发票、报关单的单价是保留小数点后四位

箱单的重量都保留小数点后两位Alpha的箱单,散箱出货时,列号一栏表头需显示:CTN No",下面显示箱号,总托数那一栏可以不显示,下面的托数也不用显示美国跟加拿大的报关单上的件数要显示箱数,请帮忙修改下
master
han\hanst 5 days ago
parent
commit
d8ef59be2b
  1. 2
      src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java
  2. 4
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
  3. BIN
      src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx
  4. BIN
      src/main/resources/templates/ALPHA/declaration-all-template.xlsx
  5. BIN
      src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx

2
src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java

@ -642,7 +642,7 @@ public class ExcelTemplateALPHA {
style.setFont(font); style.setFont(font);
boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i); boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText(); boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER);
style.setAlignment(HorizontalAlignment.LEFT); style.setAlignment(HorizontalAlignment.LEFT);
style.setWrapText(keepWrapText || declarationHsCodeDescColumn); style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
c7.setCellStyle(style); c7.setCellStyle(style);

4
src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java

@ -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) { private String resolveLoadingNoTemplateValue(EcssDeclarationHeaderData data, EcssCoDelNotifyHeaderData notifyHeader) {
String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo()) String buNo = notifyHeader != null && StringUtils.isNotBlank(notifyHeader.getBuNo())
@ -2987,7 +2987,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
} }
Integer palletQty = palletQtyMap.get(palletSeqNo); Integer palletQty = palletQtyMap.get(palletSeqNo);
// 第一列展示托号pallet_no按托盘首行显示后续行留空再做按托合并 // 第一列展示托号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("total_pallets", showPalletQty ? (palletQty != null ? palletQty : "") : "");
eorder.put("volume", isFirstRow ? volume : ""); eorder.put("volume", isFirstRow ? volume : "");
eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : ""); eorder.put("gross_weight", isFirstRow ? ((BigDecimal) list.get(m).get("gross_weight")).setScale(2, RoundingMode.HALF_UP) : "");

BIN
src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx

BIN
src/main/resources/templates/ALPHA/declaration-all-template.xlsx

BIN
src/main/resources/templates/ALPHA/declaration-packingList-template.xlsx

Loading…
Cancel
Save