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

fix:出口报关明细报表，金额数量字段取值修改

Browse Source 
(cherry picked from commit c080eba304)
This commit is contained in:
zzs 2025-02-10 17:44:13 +08:00
parent e420162b4c
commit e22e0ec409
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,8 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(salesorder_info))
.finish();
dataSet = doAmountApportionment(dataSet);
dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
//原币离岸价
"yem_amount - tmp_reightamtend - tmp_premiumamtcy yem_basefobamt");
@ -98,7 +100,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
String fladingno = filter.getString("yem_fladingno");//提单号
sb.append("1=1");
sb.append("1=1 AND yem_declarationstatus = '结关'");
if (YEM.isNotEmpty(fexportdate_start)) {
sb.append(" AND TO_DATE(yem_exportdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fexportdate_start)));
}
@ -128,7 +130,6 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
private DataSet queryDeclareDocx(ReportQueryParam param) {
QFilter qFilter = getCommonDeclareDocxFilter(param);
qFilter.and(new QFilter("yem_declarationstatus", "=", "结关"));
ArrayList<String> selectfields = Lists.newArrayList();
selectfields.add("id declaredocx_id");
@ -141,14 +142,14 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
selectfields.add("TO_CHAR(yem_exportdate, 'yyyy-MM-dd') yem_exportdate");//出口日期
selectfields.add("yem_customer.group.id yem_customer_group");//买方所在国
selectfields.add("yem_commcountry yem_destinationcount");//贸易国别-目的国
selectfields.add("yem_es_declare_ec.yem_cusqty yem_qty");//数量
// selectfields.add("yem_es_declare_ec.yem_cusqty yem_qty");//数量
selectfields.add("yem_es_declare_ec.yem_cushscode yem_hscode");//海关商品编码-出口商品代码
selectfields.add("yem_es_declare_ec.yem_decmatericalname yem_cncustomclass");//报关分类名称-商品名称中文
selectfields.add("yem_settlement yem_settlementxt");//结算方式-付款方式
selectfields.add("yem_currency yem_currency");//结算币别-币别
selectfields.add("yem_priceitem yem_priceitem");//价格条款-贸易方式
selectfields.add("yem_es_declare_ec.yem_cusconsalesprice yem_unitprice");//单价
selectfields.add("yem_es_declare_ec.yem_cusamount yem_amount");//金额
// selectfields.add("yem_es_declare_ec.yem_cusamount yem_amount");//金额
selectfields.add("yem_realbringbillno yem_ladingno");//提单号
selectfields.add("yem_sctcompnayname.id yem_sctcompnayname");//船公司
selectfields.add("yem_cyreightamt yem_cyreightamt");//海运费币别
@ -166,6 +167,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
selectfields.add("yem_reightamtend yem_reightamtend");//海运费（结算币别）
selectfields.add("yem_premiumamtcy yem_premiumamtcy");//保费（结算币别）
selectfields.add("yem_declarationstatus yem_declarationstatus");//申报状态
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
@ -184,7 +186,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(aggPort))
.finish();
dataSet = doAmountApportionment(dataSet);
// dataSet = doAmountApportionment(dataSet);
return dataSet;
}
@ -525,6 +527,8 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
ArrayList<String> selectfields = Lists.newArrayList();
selectfields.add("billno exportinvoice_billno");
selectfields.add("yem_exportinvoice_c.yem_customsdeclaration yem_unit");
selectfields.add("yem_exportinvoice_c.yem_cusqty yem_qty");
selectfields.add("yem_exportinvoice_c.yem_cusamount yem_amount");
selectfields.add("yem_exportinvoice_c.yem_sourcebillentryid ddd_id_ei_entry_fk");
selectfields.add("yem_exportinvoice_c.yem_localinvoicedamo yem_cnyinvoiced");//金额-人民币开票额
selectfields.add("yem_exrate yem_baserate");//原币汇率