violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat:整机发运明细表增加字段，调拨日期"

Browse Source 
This reverts commit 70fbbdfc57.
This commit is contained in:
zzs 2025-02-14 14:11:29 +08:00
parent 09d0f6f468
commit 33a201518d
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
View File

@ -472,41 +472,10 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); 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"}) dataSet = dataSet.groupBy(new String[]{"main_detail_id_vno_fk"})
.agg(new GroupConcatFunctionByComma(), "yem_vehicleno", "yem_vehicleno") .agg(new GroupConcatFunctionByComma(), "yem_vehicleno", "yem_vehicleno")
.finish(); .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<String> 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; return dataSet;
} }