diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index f1aa024f..89a9c8da 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -108,11 +108,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { resDataSet = resDataSet.addField("0.0", "yem_inventoryqty"); DataSet where = resDataSet.where(sb.toString()); - DataSet select = where.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + - ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); - resDataSet = fillWithCMMPQty(select); - return resDataSet.distinct(); + resDataSet = fillWithCMMPQty(where); + DataSet select = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + + ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); + + return select.distinct(); } /**