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");//铭牌类型