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

fix:

Browse Source 
1.发货明细表（未发货）起运港  目的港没有带出来
This commit is contained in:
ljw 2024-11-13 17:37:07 +08:00
parent dece3cf388
commit 873234cfda
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,9 @@ package com.yem.rf.salescommission;
import com.yem.wm.utils.RptUtil;
import com.yem.wm.utils.YEM;
import com.yem.wm.utils.groupfunc.GroupConcatFunctionByComma;
import kd.bos.algo.DataSet;
import kd.bos.algo.GroupbyDataSet;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.report.AbstractReportListDataPlugin;
@ -11,6 +13,7 @@ import kd.bos.entity.report.ReportQueryParam;
import kd.bos.orm.ORM;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.QueryServiceHelper;
import java.util.*;
@ -217,8 +220,6 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_airliftcost yem_airliftcost");
selectfields.add("yem_expresscost yem_expresscost");
selectfields.add("yem_offeramount yem_contractamount");
selectfields.add("yem_shipports yem_shipports");
selectfields.add("yem_destports yem_destports");
selectfields.add("yem_clientcountry yem_clientcountry");
selectfields.add("TO_CHAR(yem_acshipdate, 'yyyy-MM-dd') yem_acshipdate");
selectfields.add("yem_reccondition yem_reccondition");
@ -238,12 +239,37 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
DataSet yemEsDelivernotice = yemEsDelivernotice();
yemEsSalesorder = yemEsSalesorder.leftJoin(yemEsDelivernotice).on("queryDeliverNoticeid","delivernoticecorebillid")
.select(RptUtil.getDataSetFiledAlias(yemEsSalesorder), RptUtil.getDataSetFiledAlias(yemEsDelivernotice)).finish();
DataSet esSalesorder = EsSalesorder();
yemEsSalesorder = yemEsSalesorder.leftJoin(esSalesorder).on("queryDeliverNoticeid","newsalesorderid")
.select(RptUtil.getDataSetFiledAlias(yemEsSalesorder),RptUtil.getDataSetFiledAlias(esSalesorder)).finish();
yemEsSalesorder = yemEsSalesorder.where("billstatus = 'B' OR billstatus = 'C'");
yemEsSalesorder = yemEsSalesorder.where("delivernoticebillstatus != 'C'");
yemEsSalesorder = yemEsSalesorder.distinct();
return yemEsSalesorder;
}/**
* 外销合同多选基础资料
*
* @return
*/
private DataSet EsSalesorder() {
QFilter qFilter = getBaseQFilter();
qFilter.and("yem_es_materialinfo.yem_businesssort", QCP.equals, "P");
qFilter.and("yem_signconfirmstatus",QCP.equals,"A");
qFilter.and("yem_cancelstatus",QCP.equals,"A");
List<String> selectfields = new ArrayList<>();
selectfields.add("id newsalesorderid");
selectfields.add("yem_shipports.fbasedataid.name yem_shipports");//起运港
selectfields.add("yem_destports.fbasedataid.name yem_destports");//目的港
DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
yemEsSalesorder = yemEsSalesorder.groupBy(new String[]{"newsalesorderid"})
.agg(new GroupConcatFunctionByComma(), "yem_shipports", "yem_shipports")
.agg(new GroupConcatFunctionByComma(), "yem_destports", "yem_destports")
.finish();
return yemEsSalesorder;
}
/**
* 销售出库
* @return