diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index 879c2de0..633f2850 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -62,6 +62,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { .finish(); resDataSet = resDataSet.leftJoin(delivernotice_status) .on("order_detail_id", "core_order_id_dn_status_fk") + .on("yem_vehicleno", "dn_vehicleno_fk") .select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(delivernotice_status)) .finish(); @@ -328,11 +329,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { * @return */ private DataSet queryDeliverNoticeStatus(ReportQueryParam param) { - QFilter dnfilter = getBaseQFilter(new String[]{"B,C"}); + QFilter dnfilter = getBaseQFilter(new String[]{"B", "C"}); List dnselectfields = new ArrayList<>(); dnselectfields.add("yem_es_materialinfo.yem_coreentryid core_order_id_dn_status_fk"); dnselectfields.add("billstatus dn_status"); + dnselectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_vehicleno dn_vehicleno_fk"); return ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", dnselectfields), dnfilter.toArray()); }