md
This commit is contained in:
parent
2e677d84c0
commit
29a6eb26a4
@ -251,51 +251,47 @@ public class EmisSettleBillController extends BaseController
|
||||
//计算分项数据
|
||||
List<EmisSettleSubBillFeeitem> feeItemList=billItem.getFeeitemList();
|
||||
if( !CollectionUtils.isEmpty(feeItemList) ){
|
||||
if(feeItemList.size()>1){
|
||||
tplName="tpl/bill_tpl.xlsx";
|
||||
}
|
||||
|
||||
BigDecimal otherFee = BigDecimal.ZERO;
|
||||
BigDecimal transFee = BigDecimal.ZERO;
|
||||
BigDecimal cebFee = BigDecimal.ZERO;
|
||||
BigDecimal declareFee = BigDecimal.ZERO;
|
||||
for(EmisSettleSubBillFeeitem feeitem:feeItemList){
|
||||
if("CNY".equals(feeitem.getCurrency())) {
|
||||
if ("1001".equals(feeitem.getFeeCode())) {
|
||||
transFee=transFee.add(feeitem.getBillFee());
|
||||
if(feeItemList.size()>1) {
|
||||
tplName = "tpl/bill_tpl.xlsx";
|
||||
BigDecimal otherFee = BigDecimal.ZERO;
|
||||
BigDecimal transFee = BigDecimal.ZERO;
|
||||
BigDecimal cebFee = BigDecimal.ZERO;
|
||||
BigDecimal declareFee = BigDecimal.ZERO;
|
||||
for (EmisSettleSubBillFeeitem feeitem : feeItemList) {
|
||||
if ("CNY".equals(feeitem.getCurrency())) {
|
||||
if ("1001".equals(feeitem.getFeeCode())) {
|
||||
transFee = transFee.add(feeitem.getBillFee());
|
||||
}
|
||||
// 报关费
|
||||
else if ("2002".equals(feeitem.getFeeCode())) {
|
||||
cebFee = cebFee.add(feeitem.getBillFee());
|
||||
}
|
||||
// 清关费
|
||||
else if ("2003".equals(feeitem.getFeeCode())) {
|
||||
declareFee = declareFee.add(feeitem.getBillFee());
|
||||
} else {
|
||||
otherFee = otherFee.add(feeitem.getBillFee());
|
||||
}
|
||||
}
|
||||
// 报关费
|
||||
else if ("2002".equals(feeitem.getFeeCode())) {
|
||||
cebFee=cebFee.add(feeitem.getBillFee());
|
||||
}
|
||||
// 清关费
|
||||
else if ("2003".equals(feeitem.getFeeCode())) {
|
||||
declareFee=declareFee.add(feeitem.getBillFee());
|
||||
} else {
|
||||
otherFee=otherFee.add(feeitem.getBillFee());
|
||||
}
|
||||
}else{
|
||||
|
||||
}
|
||||
|
||||
voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("declareFee", declareFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : declareFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString());
|
||||
}else{
|
||||
tplName = "tpl/bill_tpl_simple.xlsx";
|
||||
voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
|
||||
}
|
||||
|
||||
voMap.put("transFee",transFee.compareTo(BigDecimal.ZERO)==0?"0":transFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("cebFee",cebFee.compareTo(BigDecimal.ZERO)==0?"0":cebFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("declareFee",declareFee.compareTo(BigDecimal.ZERO)==0?"0": declareFee.stripTrailingZeros().toPlainString());
|
||||
voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO)==0?"0":otherFee.stripTrailingZeros().toPlainString());
|
||||
}else{
|
||||
|
||||
tplName = "tpl/bill_tpl_simple.xlsx";
|
||||
voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
|
||||
}
|
||||
|
||||
// {.transFee} {.cebFee} {.declareFee} {.otherFee}
|
||||
|
||||
listMap.add(voMap);
|
||||
}else{
|
||||
voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
|
||||
}
|
||||
|
||||
|
||||
|
||||
ServletOutputStream outputStream = response.getOutputStream();
|
||||
|
||||
//账单主数据填充
|
||||
|
||||
Loading…
Reference in New Issue
Block a user