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

fix:出口报关明细报表,实际申报要素

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-05 14:32:36 +08:00
parent ecfcde8156
commit d1fd8b0efc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
selectfields.add("yem_usbexrate yem_usdrate");//美元汇率
selectfields.add("yem_es_declare_ec.yem_taxrefundrates yem_degrate");//退税率
selectfields.add("yem_declarenumber yem_declarationno");//报关单号
selectfields.add("yem_es_declare_ec.yem_declarationele yem_declarationeletxt");//实际申报要素-规格型号
selectfields.add("yem_es_declare_ec.yem_declarationelee yem_declarationeletxt");//实际申报要素-规格型号
selectfields.add("yem_reightamtbase yem_reightamtbase");//海运费（本位币）
selectfields.add("yem_premiumamtbase yem_premiumamtbase");//保费（本位币）
@ -363,13 +363,12 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
.select("declare_id_gp_fk declare_id_gp_fk_1, rl_merged_seq rl_merged_seq_1, yem_shipdate, yem_contactno");
DataSet infoDataSet2 = dataSet.copy().groupBy(new String[]{"declare_id_gp_fk", "rl_merged_seq"})
.agg(new GroupTopOneFunction(), "yem_declarationele", "yem_declarationele")
.agg(new GroupTopOneFunction(), "rl_detail_id", "rl_detail_id")
.agg(new GroupTopOneFunction(), "main_id", "main_id")
.agg(new GroupTopOneFunction(), "yem_orderno", "yem_orderno")
.agg(new GroupTopOneFunction(), "rl_merged_seq", "rl_merged_seq")
.finish()
.select("declare_id_gp_fk declare_id_gp_fk_2, rl_merged_seq rl_merged_seq_2, yem_declarationele, rl_detail_id, main_id, yem_orderno, rl_merged_seq");
.select("declare_id_gp_fk declare_id_gp_fk_2, rl_merged_seq rl_merged_seq_2, rl_detail_id, main_id, yem_orderno, rl_merged_seq");
dataSet = infoDataSet1.leftJoin(infoDataSet2)
.on("declare_id_gp_fk_1", "declare_id_gp_fk_2")
@ -394,8 +393,6 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
selectfields.add("yem_es_materialinfo.id detail_id");
selectfields.add("yem_es_materialinfo.yem_coreentryid main_order_id_ddd_fk");
// selectfields.add("yem_es_materialinfo.yem_declarationele yem_declarationele");
return ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
}