diff --git a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java index 032121e8..2678ec17 100644 --- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java @@ -472,10 +472,41 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); + DataSet transformDataSet = queryTransformDate(); + + transformDataSet = transformDataSet.leftJoin(dataSet) + .on("tr_fk_vehicleno", "yem_vehicleno") + .select(RptUtil.getDataSetFiledAlias(transformDataSet) ,RptUtil.getDataSetFiledAlias(dataSet)) + .finish(); + transformDataSet = transformDataSet.select("yem_transformdate, main_detail_id_vno_fk main_detail_id_vno_fk_tr"); + dataSet = dataSet.groupBy(new String[]{"main_detail_id_vno_fk"}) .agg(new GroupConcatFunctionByComma(), "yem_vehicleno", "yem_vehicleno") .finish(); - dataSet = dataSet.select("main_detail_id_vno_fk", "yem_vehicleno"); + + dataSet = dataSet.leftJoin(transformDataSet) + .select(RptUtil.getDataSetFiledAlias(transformDataSet) ,RptUtil.getDataSetFiledAlias(dataSet)) + .on("main_detail_id_vno_fk", "main_detail_id_vno_fk_tr") + .finish(); + + dataSet = dataSet.select("main_detail_id_vno_fk", "yem_vehicleno", "yem_transformdate"); + + return dataSet; + } + + /** + * 查询调拨订单申请单,调拨业务日期 + * @return + */ + private DataSet queryTransformDate() { + QFilter qFilter = getBaseQFilter(); + qFilter.and(new QFilter("yem_es_materialinfo.yem_remark", "!=","")); + ArrayList selectfields = Lists.newArrayList(); + selectfields.add("yem_es_materialinfo.yem_remark tr_fk_vehicleno");//整机编号 + selectfields.add("yem_bizdate yem_transformdate");//业务日期 + DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_transferorder", String.join(",", selectfields), qFilter.toArray()).orderBy(new String[]{"yem_transformdate DESC"}); + + dataSet = dataSet.select("TO_CHAR(yem_transformdate, 'yyyy-MM-dd') yem_transformdate, tr_fk_vehicleno"); return dataSet; }