From 7b9d3d50b68c4d75c20dfec5cf006c2a3620fd51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Tue, 14 Jan 2025 17:46:22 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=B4=A2=E5=8A=A1=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE?= =?UTF-8?q?service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=BC=96=E5=8F=B7=E8=B5=8B=E5=80=BC=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/service/impl/FinancialReceivablesServiceImpl.java | 1 + .../resources/templates/financial/receivables/receivables.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java index debb07d1..9b556a29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java @@ -224,6 +224,7 @@ public class FinancialReceivablesServiceImpl implements IFinancialReceivablesSer financialReceivables.setCustomerId(sysCustomerVo.getEnterpriseCode()); financialReceivables.setCustomerName(sysCustomerVo.getEnterpriseName()); financialReceivables.setCurrencyType(sysSalesOrderVo.getCommonCurrency()); + financialReceivables.setContractNumber(sysSalesOrderVo.getSalesOrderNumber()); financialReceivables.setPriceExcludingTax(BigDecimal.valueOf(sysSalesOrderVo.getNoRmbSum())); financialReceivables.setPriceIncludesTax(BigDecimal.valueOf(sysSalesOrderVo.getRmbTaxSum())); financialReceivables.setReceivedIncludesTax(BigDecimal.ZERO); diff --git a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html index 2660a9ba..27516df5 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html +++ b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html @@ -135,7 +135,7 @@ {title: '关联单号', field: 'salesOrderCode',align: 'center',}, {title: '客户ID', field: 'customerId',align: 'center',}, {title: '客户名称', field: 'customerName',align: 'center',}, - {title: '合同编号', field: 'contractNumber',align: 'center',visible: false,}, + {title: '合同编号', field: 'contractNumber',align: 'center',}, {title: '币种', field: 'currencyType',align: 'center', formatter: function(value, row, index) {