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-15 23:56:06 +08:00
parent d7b1da08a7
commit 31386ef6dc
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/yem/rf/salescommission/ShipmentsChedulePlugin.java
View File

@ -276,7 +276,6 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin {
selectfields.add("billno billnoaddes"); selectfields.add("billno billnoaddes");
selectfields.add("yem_sourcebillid delivernoticebillid"); selectfields.add("yem_sourcebillid delivernoticebillid");
DataSet yem_es_delivernotice = ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray()); DataSet yem_es_delivernotice = ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray());
// yem_es_delivernotice.where("delivernoticebillid = 2008671881934155776");
yem_es_delivernotice = yem_es_delivernotice.groupBy(new String[]{"delivernoticebillid", "billnoaddes"}).agg(new GroupConcatFunction(), "yem_datebus", "yem_datebusin").finish(); yem_es_delivernotice = yem_es_delivernotice.groupBy(new String[]{"delivernoticebillid", "billnoaddes"}).agg(new GroupConcatFunction(), "yem_datebus", "yem_datebusin").finish();
//出口报关 //出口报关
FilterInfo filter = reportQueryParam.getFilter(); FilterInfo filter = reportQueryParam.getFilter();
@ -284,7 +283,6 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin {
Date start = filter.getDate("yem_Billofladingday");//提单日期-开始 Date start = filter.getDate("yem_Billofladingday");//提单日期-开始
Date end = filter.getDate("yem_Lookoutdateawbday");//提单日期-结束 Date end = filter.getDate("yem_Lookoutdateawbday");//提单日期-结束
qFilter1.and("yem_sumopbill", QCP.equals, "B"); qFilter1.and("yem_sumopbill", QCP.equals, "B");
qFilter1.and("billno", QCP.equals, "CKBGDZ-240803-0001");
if (YEM.isNotEmpty(start)) { if (YEM.isNotEmpty(start)) {
qFilter1.and("yem_tddate", ">=", start); qFilter1.and("yem_tddate", ">=", start);
} }
@ -299,9 +297,6 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin {
selectfield1.add("yem_es_declare_ec.yem_splitopbill splitopbillyemid"); selectfield1.add("yem_es_declare_ec.yem_splitopbill splitopbillyemid");
selectfield1.add("yem_sourcebillid declaredocxyemid"); selectfield1.add("yem_sourcebillid declaredocxyemid");
DataSet yem_es_declaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfield1), qFilter1.toArray()); DataSet yem_es_declaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfield1), qFilter1.toArray());
// yem_es_declaredocx = yem_es_declaredocx
// .groupBy(new String[]{"splitopbillyemid", "yem_es_materialinfoid"})
// .finish();
//订舱通知单 //订舱通知单
List<String> selectfield2 = new ArrayList<>(); List<String> selectfield2 = new ArrayList<>();
selectfield2.add("id storagetranssid"); selectfield2.add("id storagetranssid");
@ -309,18 +304,10 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin {
selectfield2.add("yem_es_materialinfo.yem_sgnenumber yem_sgnenumber"); selectfield2.add("yem_es_materialinfo.yem_sgnenumber yem_sgnenumber");
DataSet yem_es_storagetrans = ORM.create().queryDataSet(algoKey, "yem_es_storagetrans", String.join(",", selectfield2), qFilter.toArray()); DataSet yem_es_storagetrans = ORM.create().queryDataSet(algoKey, "yem_es_storagetrans", String.join(",", selectfield2), qFilter.toArray());
yem_es_storagetrans = yem_es_storagetrans.groupBy(new String[]{"storagetranssid", "yem_sgnenumber"}).finish(); yem_es_storagetrans = yem_es_storagetrans.groupBy(new String[]{"storagetranssid", "yem_sgnenumber"}).finish();
//发运明细单
// List<String> selectfield3 = new ArrayList<>();
// selectfield3.add("id shippingdetailid");
// DataSet yemShippingdetails1 = ORM.create().queryDataSet(algoKey, "yem_shippingdetails", String.join(",", selectfield3), qFilter.toArray());
DataSet finish = yem_es_declaredocx.leftJoin(yem_es_storagetrans) DataSet finish = yem_es_declaredocx.leftJoin(yem_es_storagetrans)
.on("declaredocxyemid", "storagetranssid") .on("declaredocxyemid", "storagetranssid")
.select(RptUtil.getDataSetFiledAlias(yem_es_declaredocx), RptUtil.getDataSetFiledAlias(yem_es_storagetrans)) .select(RptUtil.getDataSetFiledAlias(yem_es_declaredocx), RptUtil.getDataSetFiledAlias(yem_es_storagetrans))
.finish(); .finish();
// finish= finish.leftJoin(yemShippingdetails1)
// .on("storagetransyemid","shippingdetailid")
// .select(RptUtil.getDataSetFiledAlias(finish),RptUtil.getDataSetFiledAlias(yemShippingdetails1))
// .finish();
finish = finish.leftJoin(yem_es_delivernotice) finish = finish.leftJoin(yem_es_delivernotice)
.on("yem_sgnenumber", "billnoaddes") .on("yem_sgnenumber", "billnoaddes")
.select(RptUtil.getDataSetFiledAlias(finish), RptUtil.getDataSetFiledAlias(yem_es_delivernotice)) .select(RptUtil.getDataSetFiledAlias(finish), RptUtil.getDataSetFiledAlias(yem_es_delivernotice))