From e89faa7bcca9dcc42ea13f451cd6e24d6b44febd Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 19:17:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 36aab5da..55c0b287 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -414,12 +414,14 @@ public class SDNYMainProcessController extends AbstractController { object.setZFILED2(""); object.setZFILED3(""); object.setZFILED4(""); - List gsClients = gsClientMapper.selectByGsdm(orgCode); - if(gsClients != null && gsClients.size() > 0) { - object.setZFILED5(gsClients.get(0).getClient()); - }else{ - object.setZFILED5(environment); - } +// List gsClients = gsClientMapper.selectByGsdm(orgCode); +// if(gsClients != null && gsClients.size() > 0) { +// object.setZFILED5(gsClients.get(0).getClient()); +// }else{ +// object.setZFILED5(environment); +// } + + object.setZFILED5(environment); List sapInvoiceInfos = new ArrayList<>(); if (invoiceInfoList != null && invoiceInfoList.size() > 0) { for (SNInvoice invoice : invoiceInfoList) { From 0a04489c44fd339a472379141d0f5984bffa7ed7 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 19:21:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-erp/src/main/resources/bootstrap-std.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/resources/bootstrap-std.yaml b/dxhy-erp/src/main/resources/bootstrap-std.yaml index 2b0faa83..588bf1e1 100644 --- a/dxhy-erp/src/main/resources/bootstrap-std.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-std.yaml @@ -4,13 +4,13 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.147:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-erp-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -19,9 +19,9 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.147:33000 + server-addr: 172.31.36.143:33000 # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file