violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-report-zzs'

Browse Source
This commit is contained in:
ljw 2024-09-09 11:47:41 +08:00
commit e2d3be798e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java
View File

@ -74,7 +74,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
"yem_basefobamt * yem_baserate yem_cnyfobamt"); "yem_basefobamt * yem_baserate yem_cnyfobamt");
dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + 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)) + "," + dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
//美元离岸价 //美元离岸价
"CASE WHEN yem_usdrate > 0 THEN yem_cnyfobamt / yem_usdrate ELSE 0.0 END yem_usdfobamt"); "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("billno exportinvoice_billno");
selectfields.add("yem_exportinvoice_c.yem_customsdeclaration yem_unit"); 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_sourcebillentryid ddd_id_ei_entry_fk");
selectfields.add("yem_exportinvoice_c.yem_cusamount yem_cnyinvoiced");//金额-人民币开票额 selectfields.add("yem_exportinvoice_c.yem_localinvoicedamo yem_cnyinvoiced");//金额-人民币开票额
selectfields.add("yem_exrate yem_baserate");//原币汇率 selectfields.add("yem_exrate yem_baserate");//原币汇率
selectfields.add("yem_invoicenumber yem_invoiceno");//发票号码 selectfields.add("yem_invoicenumber yem_invoiceno");//发票号码
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_exportinvoice", String.join(",", selectfields), qFilter.toArray()); DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_exportinvoice", String.join(",", selectfields), qFilter.toArray());

2
src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java
View File

@ -220,6 +220,8 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id"); selectfields.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id");
// selectfields.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制 // selectfields.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制
selectfields.add("yem_es_materialinfo.yem_remarks yem_remark");//备注 selectfields.add("yem_es_materialinfo.yem_remarks yem_remark");//备注
selectfields.add("yem_nameplatelogo.id yem_nameplatelogo");//铭牌标识
selectfields.add("yem_nameplatetype yem_nameplatetype");//铭牌类型
return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null); return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null);
} }