diff --git a/dxhy-admin/src/main/resources/dxhy-logback.xml b/dxhy-admin/src/main/resources/dxhy-logback.xml
index ac4e26d6..d2d6386a 100644
--- a/dxhy-admin/src/main/resources/dxhy-logback.xml
+++ b/dxhy-admin/src/main/resources/dxhy-logback.xml
@@ -16,7 +16,7 @@
- DEBUG
+ INFO
${PATTERN}
diff --git a/dxhy-admin/src/main/resources/logback-spring.xml b/dxhy-admin/src/main/resources/logback-spring.xml
index 1675cc6c..98e953ff 100644
--- a/dxhy-admin/src/main/resources/logback-spring.xml
+++ b/dxhy-admin/src/main/resources/logback-spring.xml
@@ -25,7 +25,7 @@
-
+
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 dc409676..762082b0 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
@@ -228,6 +228,15 @@ public class SDNYMainProcessController extends AbstractController {
checkInvoice.put("invoiceCode", invoiceCode);
checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
+ String uuid = "";
+ if(invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)){
+ uuid = invoiceCode + checkInvoice.get("invoiceNo").toString();
+ checkInvoice.put("uuid",uuid);
+ }else{
+ uuid = checkInvoice.get("invoiceNo").toString();
+ checkInvoice.put("uuid",uuid);
+ }
+
String kprq = checkInvoice.get("invoiceDate").toString();
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
diff --git a/dxhy-erp/src/main/resources/bootstrap-dev.yaml b/dxhy-erp/src/main/resources/bootstrap-dev.yaml
index aa8b3494..d2241fff 100644
--- a/dxhy-erp/src/main/resources/bootstrap-dev.yaml
+++ b/dxhy-erp/src/main/resources/bootstrap-dev.yaml
@@ -4,22 +4,24 @@ spring:
nacos:
config:
# Nacos config 地址
- server-addr: 10.1.2.202:8848
+ server-addr: 172.31.36.147:33000
# Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace)
- namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
+ namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
# Nacos config 分组
group: dxhy-erp-group
# Nacos config 登录用户名
- username: dxhy-jxpt
+ username: nacos
# Nacos config 登录密码
- password: dxhy-jxpt
+ password: Invoice.nacos.!1
# Nacos config 配置文件前缀
prefix: dxhy-erp
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
file-extension: yaml
# Nacos discovery 配置
discovery:
- server-addr: 10.1.2.202:8848
- username: dxhy-jxpt
- password: dxhy-jxpt
- namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
\ No newline at end of file
+ server-addr: 172.31.36.147:33000
+ # Nacos config 登录用户名
+ username: nacos
+ # Nacos config 登录密码
+ password: Invoice.nacos.!1
+ namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
\ No newline at end of file
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
index 6d0d2e7f..a24970b6 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java
@@ -92,7 +92,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl/home/dxhy/logs/
-
-
-
+
+ true
+
@@ -220,9 +220,9 @@
/home/dxhy/logs/
-
- true
-
+
+
+