From 03142d6aa2ee4250b816be849c8fe95399276517 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 27 Aug 2024 06:18:11 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleBillController.java | 116 +++++++----------- .../EmisSettleInvoiceRecordController.java | 2 + 2 files changed, 45 insertions(+), 73 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 86abac3bc..a2781eb2f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -455,97 +455,67 @@ public class EmisSettleBillController extends BaseController voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark()); + BigDecimal otherFee = BigDecimal.ZERO; + BigDecimal transFee = BigDecimal.ZERO; + BigDecimal cebFee = BigDecimal.ZERO; + BigDecimal declareFee = BigDecimal.ZERO; + String transFeeStr = ""; + String cebFeeStr = ""; + String declareFeeStr = ""; + String otherFeeStr = ""; + //计算分项数据 List feeItemList=billItem.getFeeitemList(); if( !CollectionUtils.isEmpty(feeItemList) ){ - - BigDecimal otherFee = BigDecimal.ZERO; - BigDecimal transFee = BigDecimal.ZERO; - BigDecimal cebFee = BigDecimal.ZERO; - BigDecimal declareFee = BigDecimal.ZERO; - - - String transFeeStr = ""; - String cebFeeStr = ""; - String declareFeeStr = ""; - String otherFeeStr = ""; - for (EmisSettleSubBillFeeitem feeitem : feeItemList) { - String currencyStr=""; - if(StringUtils.isEmpty(feeitem.getCurrency())){ - feeitem.setCurrency("CNY"); - } + // 币种 + String currencyStr=""; + if(StringUtils.isEmpty(feeitem.getCurrency())){ + feeitem.setCurrency("CNY"); + } + if(!"CNY".equals(feeitem.getCurrency())){ + currencyStr="("+feeitem.getCurrency()+")"; + } - if(!"CNY".equals(feeitem.getCurrency())){ - currencyStr="("+feeitem.getCurrency()+")"; - } + // 费用细分 + if ("1001".equals(feeitem.getFeeCode())) { + transFee = transFee.add(feeitem.getBillFee()); + transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; + } + // 报关费 + else if ("2002".equals(feeitem.getFeeCode())) { + cebFee = cebFee.add(feeitem.getBillFee()); + cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; + } + // 清关费 + else if ("2003".equals(feeitem.getFeeCode())) { + declareFee = declareFee.add(feeitem.getBillFee()); + declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; -// if ("CNY".equals(feeitem.getCurrency())) { - if ("1001".equals(feeitem.getFeeCode())) { - transFee = transFee.add(feeitem.getBillFee()); - transFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; - } - // 报关费 - else if ("2002".equals(feeitem.getFeeCode())) { - cebFee = cebFee.add(feeitem.getBillFee()); - cebFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; - } - // 清关费 - else if ("2003".equals(feeitem.getFeeCode())) { - declareFee = declareFee.add(feeitem.getBillFee()); - declareFeeStr= feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr; + } else { + otherFee = otherFee.add(feeitem.getBillFee()); + otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+","; + } - } else { - otherFee = otherFee.add(feeitem.getBillFee()); - otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+","; - } -// } } -// voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString()); if(StringUtils.isEmpty(transFeeStr)){ transFeeStr="0"; } - - voMap.put("transFee", transFeeStr); - - - if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) { - tplName = "tpl/bill_tpl.xlsx"; -// 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()); - - if(StringUtils.isEmpty(cebFeeStr)){ - cebFeeStr="0"; - } - - if(StringUtils.isEmpty(declareFeeStr)){ - declareFeeStr="0"; - } - - if(StringUtils.isEmpty(otherFeeStr)){ - otherFeeStr="0"; - } - - voMap.put("cebFee", cebFeeStr); - voMap.put("declareFee", declareFeeStr); - voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,",")); - - }else{ - tplName = "tpl/bill_tpl_simple.xlsx"; - } - }else{ - tplName = "tpl/bill_tpl_simple.xlsx"; - voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); - + transFeeStr=billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString(); } + + voMap.put("transFee",transFeeStr); + voMap.put("cebFee",cebFeeStr); + voMap.put("declareFee",declareFeeStr); + voMap.put("otherFee",otherFeeStr); + listMap.add(voMap); } - + tplName = "tpl/bill_tpl.xlsx"; ServletOutputStream outputStream = response.getOutputStream(); //账单主数据填充 diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java index f4c8a6684..8d11f82fd 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java @@ -193,6 +193,8 @@ public class EmisSettleInvoiceRecordController extends BaseController emisSettleInvoiceRecord.setAuditNote(spr.getAuditNote()); emisSettleInvoiceRecordService.auditCenterNoPass(emisSettleInvoiceRecord); + // 重新计算账单开票状态 + }catch (Exception ex){ ex.printStackTrace(); // 返回子定义异常