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

fix:国贸订单明细，已发货行不显示

Browse Source
This commit is contained in:
zzs 2024-12-03 11:35:57 +08:00
parent 06e61efd62
commit f292ea085a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java
View File

@ -62,6 +62,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
.finish();
resDataSet = resDataSet.leftJoin(delivernotice_status)
.on("order_detail_id", "core_order_id_dn_status_fk")
.on("yem_vehicleno", "dn_vehicleno_fk")
.select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(delivernotice_status))
.finish();
@ -328,11 +329,12 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
* @return
*/
private DataSet queryDeliverNoticeStatus(ReportQueryParam param) {
QFilter dnfilter = getBaseQFilter(new String[]{"B,C"});
QFilter dnfilter = getBaseQFilter(new String[]{"B", "C"});
List<String> dnselectfields = new ArrayList<>();
dnselectfields.add("yem_es_materialinfo.yem_coreentryid core_order_id_dn_status_fk");
dnselectfields.add("billstatus dn_status");
dnselectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_vehicleno dn_vehicleno_fk");
return ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", dnselectfields), dnfilter.toArray());
}