From 23a7d964f3b60d6548f46a06dae20ab0a5fe19b9 Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Wed, 19 Mar 2025 16:42:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E5=A2=9E=E5=8A=A0=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91-=EF=BC=88=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8D=E7=AD=89=E4=BA=8E?=
 =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=9C=8D=E5=8A=A1=E7=BB=B4=E4=BF=AE=E4=B8=89?=
 =?UTF-8?q?=E5=8C=85=E8=AE=A2=E5=8D=95=E6=88=96=E8=80=85=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=A7=94=E6=89=98=E5=A4=96=E9=87=87=E8=AE=A2=E5=8D=95=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java    | 2 ++
 1 file changed, 2 insertions(+)

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());
     }