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

fix:

Browse Source 
1.增加过滤逻辑-（单据业务类型不等于配件服务维修三包订单或者客户委托外采订单，
This commit is contained in:
25655 2025-03-19 16:42:25 +08:00
parent b780d577fa
commit 23a7d964f3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ public class SalesOfRoyaltyParts extends AbstractReportListDataPlugin {
",yem_actualsalesamount * yem_exchangerate yem_outboundamount" + ",yem_actualsalesamount * yem_exchangerate yem_outboundamount" +
",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" + ",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" +
",CASE WHEN yem_sourcebillid = sourcebillid THEN ladingdatetext ELSE '' END yem_ladingdatetext"); ",CASE WHEN yem_sourcebillid = sourcebillid THEN ladingdatetext ELSE '' END yem_ladingdatetext");
select = select.where("billbusstypenumber != 'BBT-6' AND billbusstypenumber != 'BBT-4'");
if (YEM.isNotEmpty(start)||YEM.isNotEmpty(end)){ if (YEM.isNotEmpty(start)||YEM.isNotEmpty(end)){
return select.where("ladingdatetext is not null"); return select.where("ladingdatetext is not null");
} }
@ -151,6 +152,7 @@ public class SalesOfRoyaltyParts extends AbstractReportListDataPlugin {
selectfields.add("yem_es_materialinfo.yem_fobprice yem_fobprice"); selectfields.add("yem_es_materialinfo.yem_fobprice yem_fobprice");
selectfields.add("yem_es_materialinfo.yem_afterfrontdisprice yem_afterfrontdisprice"); selectfields.add("yem_es_materialinfo.yem_afterfrontdisprice yem_afterfrontdisprice");
selectfields.add("yem_offeramount"); selectfields.add("yem_offeramount");
selectfields.add("yem_billbusstype.number billbusstypenumber");
return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
} }