From fd75a6a02e3dd9fc5a13ad9159af17d0a891d656 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Wed, 4 Sep 2024 18:18:15 +0800 Subject: [PATCH] =?UTF-8?q?wip:=E5=87=BA=E5=8F=A3=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8,=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExportDeclarationDetailsReportPlugin.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java index 8a246d28..d7bffac0 100644 --- a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java @@ -57,6 +57,24 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(exportinvoice)) .finish(); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //原币离岸价 + "yem_amount - tmp_reightamtend - tmp_premiumamtcy yem_basefobamt"); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //人民币离岸价 + "yem_basefobamt * yem_baserate yem_cnyfobamt"); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //人民币离岸价与开票额差额 + "yem_cnyfobamt - yem_cnyinvoiced yem_fobsubinvoiced"); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //美元离岸价 + "yem_cnyfobamt / yem_usdrate yem_usdfobamt"); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //出口创汇 + "yem_usdfobamt + usd_sea_amt + usd_pmamt_amt yem_earning"); + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + + //应退税额 + "yem_cnyfobamt * yem_degrate / 100 yem_refundabletax"); return dataSet; } @@ -433,7 +451,9 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData selectfields.add("billno exportinvoice_billno"); selectfields.add("yem_exportinvoice_c.yem_customsdeclaration yem_unit"); selectfields.add("yem_exportinvoice_c.yem_sourcebillentryid ddd_id_ei_entry_fk"); + selectfields.add("yem_exportinvoice_c.yem_cusamount yem_cnyinvoiced");//金额-人民币开票额 selectfields.add("yem_exrate yem_baserate");//原币汇率 + selectfields.add("yem_invoicenumber yem_invoiceno");//发票号码 DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_exportinvoice", String.join(",", selectfields), qFilter.toArray()); dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + //原币汇率（百）