From 9928b2fb8614e5329ffddd90edffa68ae6828f33 Mon Sep 17 00:00:00 2001 From: violet Date: Fri, 6 Sep 2024 19:23:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?change:=E5=9B=BD=E8=B4=B8=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java index 6e819c85..11620497 100644 --- a/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java @@ -220,6 +220,8 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin { selectfields.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id"); // selectfields.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制 selectfields.add("yem_es_materialinfo.yem_remarks yem_remark");//备注 + selectfields.add("yem_nameplatelogo.id yem_nameplatelogo");//铭牌标识 + selectfields.add("yem_nameplatetype yem_nameplatetype");//铭牌类型 return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null); } From 9783f6cbb076082d37363b9d0e7192e42d4a0bdc Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 9 Sep 2024 09:17:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E5=87=BA=E5=8F=A3=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salescommission/ExportDeclarationDetailsReportPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java index fa5069af..d80f9387 100644 --- a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java +++ b/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_cusamount yem_localinvoicedamo");//金额-人民币开票额 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()); From 68359ed3dd9992784c99c6ac5b757986cf56bfb5 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 9 Sep 2024 09:31:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"fix:=E5=87=BA=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9783f6cbb076082d37363b9d0e7192e42d4a0bdc. --- .../salescommission/ExportDeclarationDetailsReportPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java index d80f9387..fa5069af 100644 --- a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java +++ b/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_localinvoicedamo");//金额-人民币开票额 + selectfields.add("yem_exportinvoice_c.yem_cusamount 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()); From f80ab3761caad607926268386cbc14b4e200e680 Mon Sep 17 00:00:00 2001 From: ljw Date: Sat, 7 Sep 2024 10:40:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=87=BA=E5=8F=A3=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=BC=80=E7=A5=A8=E9=87=91=E9=A2=9D=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salescommission/ExportDeclarationDetailsReportPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java index fa5069af..2daa4015 100644 --- a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java +++ b/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()); From 17228240da361c8d6ec8083dca97bd257e4135b8 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Mon, 9 Sep 2024 09:53:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E5=87=BA=E5=8F=A3=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salescommission/ExportDeclarationDetailsReportPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java index 2daa4015..773aa00b 100644 --- a/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java @@ -74,7 +74,7 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData "yem_basefobamt * yem_baserate yem_cnyfobamt"); dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + //人民币离岸价与开票额差额 - "yem_cnyfobamt - yem_cnyinvoiced yem_fobsubinvoiced"); + "ROUND(yem_cnyfobamt - yem_cnyinvoiced, 2) yem_fobsubinvoiced"); dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," + //美元离岸价 "CASE WHEN yem_usdrate > 0 THEN yem_cnyfobamt / yem_usdrate ELSE 0.0 END yem_usdfobamt");