From 3590bcdb35b525bd99ca3e94c6605e20c63a01a9 Mon Sep 17 00:00:00 2001 From: zzs Date: Wed, 19 Mar 2025 10:19:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B4=E6=9C=BA=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=8C=E6=95=B0=E9=87=8F=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8E=E5=87=BA=E5=8F=A3=E6=8A=A5=E5=85=B3=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salescommission/CompleteShipDetailReportPlugin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java index 8d1bb4ac..b6a38c77 100644 --- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java @@ -115,8 +115,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin dataSet = dataSet.where(sb.toString()); dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + - "CASE WHEN yem_dnbillno IS NOT NULL AND yem_dnbillno != '' THEN '是' ELSE '否' END yem_isshiped"); - + "CASE WHEN yem_dnbillno IS NOT NULL AND yem_dnbillno != '' THEN '是' ELSE '否' END yem_isshiped," + + "CASE WHEN yem_qty_dx IS NOT NULL AND yem_qty_dx >= 0 THEN yem_qty_dx ELSE yem_qty_or END yem_qty"); + dataSet = dataSet.distinct(); return dataSet; } @@ -167,7 +168,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_or");//数量-台数 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");//单台配件赠送金额-折扣、赠配件费用 @@ -645,6 +646,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin // 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");//开票日期 + selectfields.add("yem_es_materialinfo.yem_qty yem_qty_dx");//数量-台数 DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray()); yemEsDeclaredocx = yemEsDeclaredocx.distinct();