From 36e7cc6dc2bfa5a1cf803a086bcd1ddcfe95eb4c Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 5 Sep 2024 21:54:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/rf/salescommission/SparepartsNotShippedPlugin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java index ab26b952..ca8718ea 100644 --- a/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java @@ -40,6 +40,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin { DataSet selected = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) + ",(yem_offeramounts-yem_theamountpaid) yem_theamountowed" + ",CASE WHEN (yem_contractamount = yem_salcontractclaamt) THEN paymenttime ELSE null END yem_bizdate"); + selected = selected.removeFields("paymenttime"); FilterInfo filter = reportQueryParam.getFilter(); String yemContract = filter.getString("yem_billnos"); DynamicObject yemClient = filter.getDynamicObject("yem_clientname"); @@ -214,6 +215,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin { selectfields.add("yem_companyname yem_companyname"); selectfields.add("yem_bd_products.name yem_bd_products"); DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); + yemEsSalesorder = yemEsSalesorder.distinct(); yemEsSalesorder = yemEsSalesorder.select(String.join(",", RptUtil.getDataSetFiledAlias(yemEsSalesorder)) + ",yem_seafreight+yem_landcarrycost+yem_airliftcost+yem_expresscost yem_freight"); DataSet rightDataSet = yemEsSalesorders(); @@ -227,6 +229,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin { .select(RptUtil.getDataSetFiledAlias(yemEsSalesorder), RptUtil.getDataSetFiledAlias(yemEsDelivernotice)).finish(); yemEsSalesorder = yemEsSalesorder.where("billstatus = 'B' OR billstatus = 'C'"); yemEsSalesorder = yemEsSalesorder.where("delivernoticebillstatus != 'C'"); + yemEsSalesorder = yemEsSalesorder.distinct(); return yemEsSalesorder; }