diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java index b7026384..30ee6bd4 100644 --- a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java @@ -277,8 +277,34 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin { selectfields.add("TO_CHAR(yem_acshipdate, 'yyyy-MM-dd') yem_estimatedshipment"); selectfields.add("yem_reccondition.name yem_paymentmethods"); // selectfields.add("yem_es_materialinfo.yem_businesssort yem_customsdeclaration1"); - return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); + DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); + DataSet esSalesorder = yemEsSalesorder(); + yemEsSalesorder=yemEsSalesorder.leftJoin(esSalesorder).on("queryDeliverNoticeid","yemEsSalesorderid") + .select(RptUtil.getDataSetFiledAlias(yemEsSalesorder), RptUtil.getDataSetFiledAlias(esSalesorder)).finish(); + return yemEsSalesorder; + + } + /** + * 外销合同 + * + * @return + */ + private DataSet yemEsSalesorder() { + QFilter qFilter = getBaseQFilter(); + qFilter.and("yem_es_materialinfo.yem_businesssort",QCP.equals,"P"); + qFilter.and("yem_cancelstatus",QCP.equals,"A"); + List selectfields = new ArrayList<>(); + selectfields.add("id yemEsSalesorderid"); + selectfields.add("yem_es_materialinfo.yem_qty yem_numbercontracts"); + DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()); + yemEsSalesorder =yemEsSalesorder.groupBy(new String[]{"yemEsSalesorderid"}).sum("yem_numbercontracts").finish(); + return yemEsSalesorder; + + + } + + /** * 订舱通知单