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

明细报表开发

Browse Source
This commit is contained in:
ljw 2024-09-05 21:54:57 +08:00 committed by violet
parent d427f6a104
commit 36e7cc6dc2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java
View File

@ -40,6 +40,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
DataSet selected = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) +
",(yem_offeramounts-yem_theamountpaid) yem_theamountowed" +
",CASE WHEN (yem_contractamount = yem_salcontractclaamt) THEN paymenttime ELSE null END yem_bizdate");
selected = selected.removeFields("paymenttime");
FilterInfo filter = reportQueryParam.getFilter();
String yemContract = filter.getString("yem_billnos");
DynamicObject yemClient = filter.getDynamicObject("yem_clientname");
@ -214,6 +215,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_companyname yem_companyname");
selectfields.add("yem_bd_products.name yem_bd_products");
DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
yemEsSalesorder = yemEsSalesorder.distinct();
yemEsSalesorder = yemEsSalesorder.select(String.join(",", RptUtil.getDataSetFiledAlias(yemEsSalesorder)) +
",yem_seafreight+yem_landcarrycost+yem_airliftcost+yem_expresscost yem_freight");
DataSet rightDataSet = yemEsSalesorders();
@ -227,6 +229,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
.select(RptUtil.getDataSetFiledAlias(yemEsSalesorder), RptUtil.getDataSetFiledAlias(yemEsDelivernotice)).finish();
yemEsSalesorder = yemEsSalesorder.where("billstatus = 'B' OR billstatus = 'C'");
yemEsSalesorder = yemEsSalesorder.where("delivernoticebillstatus != 'C'");
yemEsSalesorder = yemEsSalesorder.distinct();
return yemEsSalesorder;
}