From a61901d58f3c501c137d6afadfb117c309289baf Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 22 Nov 2024 18:48:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E6=95=B4=E6=9C=BA=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f35fdecc63326109ed3baafcf8105fde4eb8362d) --- .../CompleteShipDetailReportPlugin.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java index 39c4806c..f4f1d291 100644 --- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java @@ -44,11 +44,11 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin .finish(); dataSet = dataSet.where("yem_salesorderno IS NOT NULL AND yem_salesorderno != ''"); -// DataSet declaredocx = queryDeclareDocx(param); -// dataSet = dataSet.leftJoin(declaredocx) -// .on("main_detail_id", "main_detail_id_decl-aredocx_fk") -// .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx)) -// .finish(); + DataSet declaredocx = queryDeclareDocx(param); + dataSet = dataSet.leftJoin(declaredocx) + .on("yem_dnbillno", "main_detail_id_declaredocx_fk") + .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx)) + .finish(); DataSet storagetrans = queryStorageTrans(param); dataSet = dataSet.leftJoin(storagetrans) @@ -577,10 +577,13 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin private DataSet queryDeclareDocx(ReportQueryParam param) { QFilter qFilter = getBaseQFilter(new String[]{"B", "C"}); ArrayList selectfields = Lists.newArrayList(); - selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk"); +// selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk"); + selectfields.add("yem_es_materialinfo.yem_sgnenumber main_detail_id_declaredocx_fk"); selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期 - return ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray()); + DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray()); + yemEsDeclaredocx = yemEsDeclaredocx.distinct(); + return yemEsDeclaredocx; } /**