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

Revert "feat:发车日报，修改未付款数量取值"

Browse Source 
This reverts commit de8651140d.
This commit is contained in:
zzs 2025-02-14 14:11:30 +08:00
parent 33a201518d
commit 6dc3ad9654
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/yem/rf/salescommission/DepartureDailyReportPlugin.java
View File

@ -242,7 +242,7 @@ public class DepartureDailyReportPlugin extends AbstractReportListDataPlugin {
DataSet dataSet;
DataSet placeexamine = queryPlaceExamine(param);//BC下单审批
DataSet salesorder = querySalesOrder(param);
DataSet trackTaskConsole = queryTrackTaskConsole(param);
dataSet = placeexamine.leftJoin(salesorder)
.on("source_order_id_placeexamine_fk", "order_id")
.select(RptUtil.getDataSetFiledAlias(placeexamine), RptUtil.getDataSetFiledAlias(salesorder))
@ -259,34 +259,9 @@ public class DepartureDailyReportPlugin extends AbstractReportListDataPlugin {
.groupBy(new String[]{"order_product_id_main_fk"})
.sum("yem_qty")
.finish();
dataSet = dataSet.leftJoin(trackTaskConsole)
.on("order_product_id_main_fk", "tkconsole_product_id_main_fk")
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(trackTaskConsole))
.finish();
dataSet = RptUtil.zeroNullNums(dataSet);
dataSet = dataSet.select("order_product_id_main_fk, yem_qty - yem_cancel_num yem_nooay");
return dataSet;
}
/**
* 查询跟单任务控制台，取消数量
* @param param
* @return
*/
private DataSet queryTrackTaskConsole(ReportQueryParam param) {
dataSet = dataSet.select("order_product_id_main_fk, yem_qty yem_nooay");
QFilter qFilter = getBaseQFilter();
List<String> selectfields = new ArrayList<>();
selectfields.add("id tkconsole_id");
selectfields.add("billno tkconsole_no");
selectfields.add("yem_es_materialinfo.yem_resourcenog.yem_products.group.id tkconsole_product_id_main_fk");
selectfields.add("yem_es_materialinfo.yem_cancel_num yem_cancel_num");
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), qFilter.toArray());
dataSet = dataSet
.groupBy(new String[]{"tkconsole_product_id_main_fk"})
.sum("yem_cancel_num")
.finish();
return dataSet;
}