diff --git a/src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java b/src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java index 07dfa6e0..858e0025 100644 --- a/src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java +++ b/src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java @@ -60,6 +60,7 @@ public class SalesOfRoyaltyParts extends AbstractReportListDataPlugin { ",yem_actualsalesamount * yem_exchangerate yem_outboundamount" + ",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" + ",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)){ 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_afterfrontdisprice yem_afterfrontdisprice"); selectfields.add("yem_offeramount"); + selectfields.add("yem_billbusstype.number billbusstypenumber"); return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); }