From f76ffc41a17f29823a11aa17ec077b5eacce3394 Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 15 Feb 2025 16:57:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=9B=BD?= =?UTF-8?q?=E8=B4=B8=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E6=9C=89=E6=95=88=E6=95=B0=E9=87=8F=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rf/salescommission/ITCOrderDetailsReportPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index f1aa024f..89a9c8da 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -108,11 +108,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { resDataSet = resDataSet.addField("0.0", "yem_inventoryqty"); DataSet where = resDataSet.where(sb.toString()); - DataSet select = where.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + - ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); - resDataSet = fillWithCMMPQty(select); - return resDataSet.distinct(); + resDataSet = fillWithCMMPQty(where); + DataSet select = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + + ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); + + return select.distinct(); } /**