diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
new file mode 100644
index 0000000..fd9e028
--- /dev/null
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -0,0 +1,28 @@
+#for tests only !
+<<<<<<< HEAD
+#Fri Jun 14 14:56:10 CST 2024
+=======
+<<<<<<< HEAD
+#Fri Jun 14 15:11:13 CST 2024
+=======
+#Fri Jun 14 11:47:35 CST 2024
+>>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200
+>>>>>>> 2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c
+jco.destination.pool_capacity=10
+jco.client.lang=ZH
+jco.client.ashost=172.19.0.125
+jco.client.saprouter=
+jco.client.user=RFC
+jco.client.sysnr=00
+jco.destination.peak_limit=10
+<<<<<<< HEAD
+jco.client.passwd=w#5?5KrYAXJkIlK$jo-`m}bwas!6.[bT!=Xmo.]-;Q#6*HV+
+jco.client.client=800
+=======
+<<<<<<< HEAD
+jco.client.passwd=654321
+=======
+jco.client.passwd=fIM!UgIY[[%*5IWWy6w`}PO$6)+{K)R`9,$_P^3ve}26(Qf|
+>>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200
+jco.client.client=300
+>>>>>>> 2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c
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 @@
删除
-
+