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

fix:

Browse Source 
1.整机发货明细表

(cherry picked from commit f35fdecc63)
This commit is contained in:
ljw 2024-11-22 18:48:03 +08:00
parent 1f37e4a0f8
commit a61901d58f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
View File

@ -44,11 +44,11 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
.finish(); .finish();
dataSet = dataSet.where("yem_salesorderno IS NOT NULL AND yem_salesorderno != ''"); dataSet = dataSet.where("yem_salesorderno IS NOT NULL AND yem_salesorderno != ''");
// DataSet declaredocx = queryDeclareDocx(param); DataSet declaredocx = queryDeclareDocx(param);
// dataSet = dataSet.leftJoin(declaredocx) dataSet = dataSet.leftJoin(declaredocx)
// .on("main_detail_id", "main_detail_id_decl-aredocx_fk") .on("yem_dnbillno", "main_detail_id_declaredocx_fk")
// .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx)) .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx))
// .finish(); .finish();
DataSet storagetrans = queryStorageTrans(param); DataSet storagetrans = queryStorageTrans(param);
dataSet = dataSet.leftJoin(storagetrans) dataSet = dataSet.leftJoin(storagetrans)
@ -577,10 +577,13 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
private DataSet queryDeclareDocx(ReportQueryParam param) { private DataSet queryDeclareDocx(ReportQueryParam param) {
QFilter qFilter = getBaseQFilter(new String[]{"B", "C"}); QFilter qFilter = getBaseQFilter(new String[]{"B", "C"});
ArrayList<String> selectfields = Lists.newArrayList(); ArrayList<String> selectfields = Lists.newArrayList();
selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk"); // selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk");
selectfields.add("yem_es_materialinfo.yem_sgnenumber main_detail_id_declaredocx_fk");
selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期 selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期
return ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray()); DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
yemEsDeclaredocx = yemEsDeclaredocx.distinct();
return yemEsDeclaredocx;
} }
/** /**