aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-26 07:30:33 +08:00
parent 08c84bc0a5
commit 8ccc44e200
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -472,37 +472,44 @@ public class EmisSettleBillController extends BaseController
for (EmisSettleSubBillFeeitem feeitem : feeItemList) { for (EmisSettleSubBillFeeitem feeitem : feeItemList) {
String currencyStr="";
if(StringUtils.isEmpty(feeitem.getCurrency())){ if(StringUtils.isEmpty(feeitem.getCurrency())){
feeitem.setCurrency("CNY"); feeitem.setCurrency("CNY");
currencyStr="";
}else{
currencyStr="("+feeitem.getCurrency()+")";
} }
// if ("CNY".equals(feeitem.getCurrency())) { // if ("CNY".equals(feeitem.getCurrency())) {
if ("1001".equals(feeitem.getFeeCode())) { if ("1001".equals(feeitem.getFeeCode())) {
transFee = transFee.add(feeitem.getBillFee()); transFee = transFee.add(feeitem.getBillFee());
transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")"; transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
} }
// 报关费 // 报关费
else if ("2002".equals(feeitem.getFeeCode())) { else if ("2002".equals(feeitem.getFeeCode())) {
cebFee = cebFee.add(feeitem.getBillFee()); cebFee = cebFee.add(feeitem.getBillFee());
cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")"; cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
} }
// 清关费 // 清关费
else if ("2003".equals(feeitem.getFeeCode())) { else if ("2003".equals(feeitem.getFeeCode())) {
declareFee = declareFee.add(feeitem.getBillFee()); declareFee = declareFee.add(feeitem.getBillFee());
declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")"; declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr;
} else { } else {
otherFee = otherFee.add(feeitem.getBillFee()); otherFee = otherFee.add(feeitem.getBillFee());
otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+"("+feeitem.getCurrency()+")"+","; otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+",";
} }
// } // }
} }
// voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString()); // voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString());
voMap.put("transFee", transFeeStr);
if(StringUtils.isEmpty(transFeeStr)){ if(StringUtils.isEmpty(transFeeStr)){
transFeeStr="0(CNY)"; transFeeStr="0";
} }
voMap.put("transFee", transFeeStr);
if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) { if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) {
tplName = "tpl/bill_tpl.xlsx"; tplName = "tpl/bill_tpl.xlsx";
// voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString()); // voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString());
@ -510,18 +517,17 @@ public class EmisSettleBillController extends BaseController
// voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString()); // voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString());
if(StringUtils.isEmpty(cebFeeStr)){ if(StringUtils.isEmpty(cebFeeStr)){
cebFeeStr="0(CNY)"; cebFeeStr="0";
} }
if(StringUtils.isEmpty(declareFeeStr)){ if(StringUtils.isEmpty(declareFeeStr)){
declareFeeStr="0(CNY)"; declareFeeStr="0";
} }
if(StringUtils.isEmpty(otherFeeStr)){ if(StringUtils.isEmpty(otherFeeStr)){
otherFeeStr="0(CNY)"; otherFeeStr="0";
} }
voMap.put("cebFee", cebFeeStr); voMap.put("cebFee", cebFeeStr);
voMap.put("declareFee", declareFeeStr); voMap.put("declareFee", declareFeeStr);
voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,",")); voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,","));