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

change:销售提成整机

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-05 14:45:26 +08:00
parent 3118ea1501
commit 1997d31018
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java
View File

@ -79,6 +79,8 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
Date fshipdate_start = filter.getDate("yem_fshipdate_start");
Date fshipdate_end = filter.getDate("yem_fshipdate_end");
long foperator = filter.getLong("yem_foperator");//
where.append("salesorder_billtype IN ('yem_es_salesorder_nmzj', 'yem_es_salesorder_ZJ') AND salesorder_commissiontype IN ('Z', 'ZP')");
if (YEM.isNotEmpty(salesorderno)) {
where.append(" AND yem_contractno LIKE '%").append(salesorderno).append("%'");
@ -110,6 +112,10 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
where.append(" AND TO_DATE(yem_shipdate,'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdate_end)));
}
if (foperator > 0) {
where.append(" AND yem_salesman = ").append(foperator);
}
resDataSet = resDataSet.where(where.toString());
return resDataSet;
@ -182,13 +188,14 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("id salesorderid");
selectfields.add("yem_es_materialinfo.id salesorderenid");
selectfields.add("yem_reccondition yem_reccondition");//收款条件
selectfields.add("yem_es_materialinfo.yem_saamtpriceclause yem_safobamount");//销售金额（价格条款） 整机合计价格
selectfields.add("yem_es_materialinfo.yem_safobprice yem_safobamount");//销售FOB单价 整机合计价格
selectfields.add("yem_es_materialinfo.yem_singlepartgiftmat yem_singlepartgiftmat");//单台配件赠送金额 赠送配件金额
selectfields.add("yem_es_materialinfo.yem_fobamount yem_companystandamt");//公司标准价
selectfields.add("CASE WHEN yem_issinosurecon = '1' THEN 'A' ELSE 'B' END yem_iscredit");//是否信保合同
selectfields.add("yem_billtype.number salesorder_billtype");//单据类型
selectfields.add("yem_es_materialinfo.yem_commissiontype salesorder_commissiontype");//业务分类
selectfields.add("yem_offeramount");
selectfields.add("yem_operator yem_salesman");//销售员
return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
}