Compare commits

...

3 Commits

Author SHA1 Message Date
zzs01@yunemao.com
17228240da fix:出口报关明细报表 2024-09-09 09:53:12 +08:00
ljw
f80ab3761c 出口报关明细开票金额更换 2024-09-09 09:31:17 +08:00
zzs01@yunemao.com
68359ed3dd Revert "fix:出口报关明细报表"
This reverts commit 9783f6cbb0.
2024-09-09 09:31:04 +08:00

View File

@ -74,7 +74,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
"yem_basefobamt * yem_baserate yem_cnyfobamt");
dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
//人民币离岸价与开票额差额
"yem_cnyfobamt - yem_cnyinvoiced yem_fobsubinvoiced");
"ROUND(yem_cnyfobamt - yem_cnyinvoiced, 2) yem_fobsubinvoiced");
dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
//美元离岸价
"CASE WHEN yem_usdrate > 0 THEN yem_cnyfobamt / yem_usdrate ELSE 0.0 END yem_usdfobamt");
@ -524,7 +524,7 @@ 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_localinvoicedamo");//金额-人民币开票额
selectfields.add("yem_exportinvoice_c.yem_localinvoicedamo 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());