From 29ae4b8b814b17d5186e84a73cc634d00e50d8d6 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Fri, 14 Jun 2024 15:44:18 +0800
Subject: [PATCH] '123'
---
ABAP_AS_WITH_POOL.jcoDestination | 8 ++++----
.../com/ruoyi/web/utils/SapFunction/ConnectToSAP.java | 4 ++--
.../main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java | 4 ++--
ruoyi-ui/src/views/redBook/productSelect.vue | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index 620db56..6b9a7f2 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,11 +1,11 @@
#for tests only !
-#Fri Jun 14 11:47:35 CST 2024
+#Fri Jun 14 14:56:10 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
-jco.client.ashost=172.19.0.120
+jco.client.ashost=172.19.0.125
jco.client.saprouter=
jco.client.user=RFC
jco.client.sysnr=00
jco.destination.peak_limit=10
-jco.client.passwd=fIM!UgIY[[%*5IWWy6w`}PO$6)+{K)R`9,$_P^3ve}26(Qf|
-jco.client.client=300
+jco.client.passwd=w#5?5KrYAXJkIlK$jo-`m}bwas!6.[bT!=Xmo.]-;Q#6*HV+
+jco.client.client=800
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/ConnectToSAP.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/ConnectToSAP.java
index 8f14672..b2c53d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/ConnectToSAP.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/ConnectToSAP.java
@@ -19,11 +19,11 @@ public class ConnectToSAP {
private static void initProperties() {
Properties connectProperties = new Properties();
// SAP服务器
- connectProperties.setProperty(DestinationDataProvider.JCO_ASHOST, "172.19.0.120");//172.19.0.125
+ connectProperties.setProperty(DestinationDataProvider.JCO_ASHOST, "172.19.0.125");//172.19.0.125
// SAP系统编号
connectProperties.setProperty(DestinationDataProvider.JCO_SYSNR, "00");
// SAP集团
- connectProperties.setProperty(DestinationDataProvider.JCO_CLIENT, "300");//800
+ connectProperties.setProperty(DestinationDataProvider.JCO_CLIENT, "800");//800
// SAP用户名
connectProperties.setProperty(DestinationDataProvider.JCO_USER, "RFC");
// SAP密码
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
index 9d22618..ba4001e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
@@ -279,7 +279,7 @@ public class excelUtil {
wff_merge.setAlignment(Alignment.LEFT);
wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN);
wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN);
- label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge);
+ label = new Label(1, i, "",wff_merge);
wsheet.addCell(label);
wsheet.mergeCells(0,i-4,0,i);
@@ -595,7 +595,7 @@ public class excelUtil {
wff_merge.setAlignment(Alignment.LEFT);
wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN);
wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN);
- label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge);
+ label = new Label(1, i, "",wff_merge);
wsheet.addCell(label);
wsheet.mergeCells(0,i-4,0,i);
diff --git a/ruoyi-ui/src/views/redBook/productSelect.vue b/ruoyi-ui/src/views/redBook/productSelect.vue
index e6b09bb..7a9e4a0 100644
--- a/ruoyi-ui/src/views/redBook/productSelect.vue
+++ b/ruoyi-ui/src/views/redBook/productSelect.vue
@@ -152,7 +152,7 @@
删除
-
+