From ab3c809ea72118703ad063a60ffb6774cde4e53c Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 14 Feb 2025 10:24:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E8=A1=A8=E5=9B=BD=E8=B4=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=96=E6=B6=88=E6=95=B0=E9=87=8F=E3=80=81=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 337ea83280a4ad8051dcb8e4373dad9c092aed8d) --- .../yem/rf/salescommission/ITCOrderDetailsReportPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index 633f2850..f1aa024f 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -109,7 +109,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { DataSet where = resDataSet.where(sb.toString()); DataSet select = where.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + - ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate"); + ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); resDataSet = fillWithCMMPQty(select); return resDataSet.distinct(); @@ -224,6 +224,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { detail.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id"); // detail.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制 detail.add("yem_es_materialinfo.yem_remarks yem_remark");//备注 + detail.add("yem_es_materialinfo.yem_cancel_num yem_cancel_num");//取消数量 detail.add("yem_nameplatelogo.id yem_nameplatelogo");//铭牌标识 detail.add("yem_nameplatetype yem_nameplatetype");//铭牌类型