From d98169b17bc2a7b8183aa60e01a856d794c7bd71 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Thu, 5 Sep 2024 11:52:34 +0800 Subject: [PATCH] =?UTF-8?q?change:=E6=95=B4=E6=9C=BA=E5=8F=91=E8=BF=90?= =?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 --- .../rf/salescommission/CompleteShipDetailReportPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java index 41fa80d1..22f7bc54 100644 --- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java @@ -117,7 +117,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin selectfields.add("yem_bd_products yem_products");//产品分类 selectfields.add("yem_priceitem yem_priceitem");//价格条款-交货方式 selectfields.add("yem_es_materialinfo.yem_sapricepriceclause yem_price");//销售单价（价格条款）-单价 -// selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量-台数 + selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量-台数 selectfields.add("yem_es_materialinfo.yem_resourcenog yem_resourceno");//资源号-订货号 selectfields.add("yem_es_materialinfo.yem_sastandardprice yem_fobpriceqd");//销售FOB标配青岛价-标准结算价格 selectfields.add("yem_es_materialinfo.yem_singlepartgiftmat yem_singlegiftpartamt");//单台配件赠送金额-折扣、赠配件费用 @@ -159,7 +159,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin selectfields.add("createtime order_createtime"); DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.copy().and("yem_es_materialinfo.yem_businesssort", "=", "Z").toArray()).orderBy(new String[]{"order_createtime"}); - dataSet = dataSet.addField("1.0", "yem_qty"); + DataSet aggVehicleNo = aggSalesOrderVehicleNo(qFilter); dataSet = dataSet.leftJoin(aggVehicleNo) .on("main_detail_id", "main_detail_id_vno_fk")