From de8651140d28e724cc0983765dc6b77f3e715f01 Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 14 Feb 2025 10:59:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E8=BD=A6=E6=97=A5=E6=8A=A5?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9C=AA=E4=BB=98=E6=AC=BE=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepartureDailyReportPlugin.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/DepartureDailyReportPlugin.java b/src/main/java/com/yem/rf/salescommission/DepartureDailyReportPlugin.java index 5b1f5fb5..8c68d2b2 100644 --- a/src/main/java/com/yem/rf/salescommission/DepartureDailyReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/DepartureDailyReportPlugin.java @@ -242,7 +242,7 @@ public class DepartureDailyReportPlugin extends AbstractReportListDataPlugin { DataSet dataSet; DataSet placeexamine = queryPlaceExamine(param);//BC下单审批 DataSet salesorder = querySalesOrder(param); - + DataSet trackTaskConsole = queryTrackTaskConsole(param); dataSet = placeexamine.leftJoin(salesorder) .on("source_order_id_placeexamine_fk", "order_id") .select(RptUtil.getDataSetFiledAlias(placeexamine), RptUtil.getDataSetFiledAlias(salesorder)) @@ -259,9 +259,34 @@ public class DepartureDailyReportPlugin extends AbstractReportListDataPlugin { .groupBy(new String[]{"order_product_id_main_fk"}) .sum("yem_qty") .finish(); + dataSet = dataSet.leftJoin(trackTaskConsole) + .on("order_product_id_main_fk", "tkconsole_product_id_main_fk") + .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(trackTaskConsole)) + .finish(); + dataSet = RptUtil.zeroNullNums(dataSet); + dataSet = dataSet.select("order_product_id_main_fk, yem_qty - yem_cancel_num yem_nooay"); + return dataSet; + } - dataSet = dataSet.select("order_product_id_main_fk, yem_qty yem_nooay"); + /** + * 查询跟单任务控制台，取消数量 + * @param param + * @return + */ + private DataSet queryTrackTaskConsole(ReportQueryParam param) { + QFilter qFilter = getBaseQFilter(); + List selectfields = new ArrayList<>(); + selectfields.add("id tkconsole_id"); + selectfields.add("billno tkconsole_no"); + selectfields.add("yem_es_materialinfo.yem_resourcenog.yem_products.group.id tkconsole_product_id_main_fk"); + selectfields.add("yem_es_materialinfo.yem_cancel_num yem_cancel_num"); + + DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), qFilter.toArray()); + dataSet = dataSet + .groupBy(new String[]{"tkconsole_product_id_main_fk"}) + .sum("yem_cancel_num") + .finish(); return dataSet; }