配件发货明细表（已发货）

src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java

@@ -524,7 +524,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
         selectfields.add("billno exportinvoice_billno");
         selectfields.add("yem_exportinvoice_c.yem_customsdeclaration yem_unit");
         selectfields.add("yem_exportinvoice_c.yem_sourcebillentryid ddd_id_ei_entry_fk");
-        selectfields.add("yem_exportinvoice_c.yem_cusamount yem_cnyinvoiced");//金额-人民币开票额
+        selectfields.add("yem_exportinvoice_c.yem_localinvoicedamo yem_cnyinvoiced");//金额-人民币开票额
         selectfields.add("yem_exrate yem_baserate");//原币汇率
         selectfields.add("yem_invoicenumber yem_invoiceno");//发票号码
         DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_exportinvoice", String.join(",", selectfields), qFilter.toArray());

src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java

@@ -45,9 +45,9 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
         DataSet yemShippingdetails = yemShippingdetails();
         DataSet yemEsDelivernotices = yemEsDelivernotices();
         //销售出库关联外销合同
-        resDataSet = queryDeliverNotice.leftJoin(yemEsDelivernotices)
-                .on("queryDeliverNoticeid", "yem_corebillids")
-                .select(RptUtil.getDataSetFiledAlias(queryDeliverNotice), RptUtil.getDataSetFiledAlias(yemEsDelivernotices))
+        resDataSet = yemEsDelivernotices.leftJoin(queryDeliverNotice)
+                .on("yem_corebillids", "queryDeliverNoticeid")
+                .select(RptUtil.getDataSetFiledAlias(yemEsDelivernotices), RptUtil.getDataSetFiledAlias(queryDeliverNotice))
                 .finish();
         //外销合同关联发运明细
         resDataSet = resDataSet.leftJoin(yemShippingdetails)