xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xd:dc84e89bcdb4a6b745e727db50b21699adf7d08d
Branches Tags
xd:main
..
compare: xd:2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c
Branches Tags
xd:main

No commits in common. "dc84e89bcdb4a6b745e727db50b21699adf7d08d" and "2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c" have entirely different histories.
dc84e89bcd ... 2d988a2a6a

4 changed files with 6 additions and 15 deletions
Show Stats Expand all files Collapse all files

11
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,28 +1,19 @@
#for tests only ! #for tests only !
<<<<<<< HEAD <<<<<<< HEAD
#Fri Jun 14 14:56:10 CST 2024
=======
<<<<<<< HEAD
#Fri Jun 14 15:11:13 CST 2024 #Fri Jun 14 15:11:13 CST 2024
======= =======
#Fri Jun 14 11:47:35 CST 2024 #Fri Jun 14 11:47:35 CST 2024
>>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200 >>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200
>>>>>>> 2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c
jco.destination.pool_capacity=10 jco.destination.pool_capacity=10
jco.client.lang=ZH jco.client.lang=ZH
jco.client.ashost=172.19.0.125 jco.client.ashost=172.19.0.120
jco.client.saprouter= jco.client.saprouter=
jco.client.user=RFC jco.client.user=RFC
jco.client.sysnr=00 jco.client.sysnr=00
jco.destination.peak_limit=10 jco.destination.peak_limit=10
<<<<<<< HEAD <<<<<<< 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=654321
======= =======
jco.client.passwd=fIM!UgIY[[%*5IWWy6w`}PO$6)+{K)R`9,$_P^3ve}26(Qf| jco.client.passwd=fIM!UgIY[[%*5IWWy6w`}PO$6)+{K)R`9,$_P^3ve}26(Qf|
>>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200 >>>>>>> 4f24577e27615af0f5c59b77a49deac1fa915200
jco.client.client=300 jco.client.client=300
>>>>>>> 2d988a2a6ab5b02b0e5a1fb532fbbe9a4506090c

4
ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/ConnectToSAP.java
View File

@ -19,11 +19,11 @@ public class ConnectToSAP {
private static void initProperties() { private static void initProperties() {
Properties connectProperties = new Properties(); Properties connectProperties = new Properties();
// SAP服务器 // SAP服务器
connectProperties.setProperty(DestinationDataProvider.JCO_ASHOST, "172.19.0.125");//172.19.0.125 connectProperties.setProperty(DestinationDataProvider.JCO_ASHOST, "172.19.0.120");//172.19.0.125
// SAP系统编号 // SAP系统编号
connectProperties.setProperty(DestinationDataProvider.JCO_SYSNR, "00"); connectProperties.setProperty(DestinationDataProvider.JCO_SYSNR, "00");
// SAP集团 // SAP集团
connectProperties.setProperty(DestinationDataProvider.JCO_CLIENT, "800");//800 connectProperties.setProperty(DestinationDataProvider.JCO_CLIENT, "300");//800
// SAP用户名 // SAP用户名
connectProperties.setProperty(DestinationDataProvider.JCO_USER, "RFC"); connectProperties.setProperty(DestinationDataProvider.JCO_USER, "RFC");
// SAP密码 // SAP密码

4
ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
View File

@ -279,7 +279,7 @@ public class excelUtil {
wff_merge.setAlignment(Alignment.LEFT); wff_merge.setAlignment(Alignment.LEFT);
wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN);
wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN);
label = new Label(1, i, "",wff_merge); label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge);
wsheet.addCell(label); wsheet.addCell(label);
wsheet.mergeCells(0,i-4,0,i); wsheet.mergeCells(0,i-4,0,i);
@ -595,7 +595,7 @@ public class excelUtil {
wff_merge.setAlignment(Alignment.LEFT); wff_merge.setAlignment(Alignment.LEFT);
wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN); wff_merge.setBorder(Border.BOTTOM, BorderLineStyle.THIN);
wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN); wff_merge.setBorder(Border.RIGHT, BorderLineStyle.THIN);
label = new Label(1, i, "",wff_merge); label = new Label(1, i, "4、低厂价，预付30%，款清发货；",wff_merge);
wsheet.addCell(label); wsheet.addCell(label);
wsheet.mergeCells(0,i-4,0,i); wsheet.mergeCells(0,i-4,0,i);

2
ruoyi-ui/src/views/redBook/productSelect.vue
View File

@ -152,7 +152,7 @@
<el-button type="text" @click="handleDeleteClick(scope.$index)">删除</el-button> <el-button type="text" @click="handleDeleteClick(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="版本uid" align="center" prop="uid_0" v-if="false"/> <el-table-column label="版本uid" align="center" prop="uid_0"/>
<el-table-column label="产品型号" align="center" prop="name_0" width="200" /> <el-table-column label="产品型号" align="center" prop="name_0" width="200" />
<el-table-column label="型号" align="center" prop="name_1" v-if="false"/> <el-table-column label="型号" align="center" prop="name_1" v-if="false"/>
<el-table-column label="规格" align="center" prop="spec" v-if="false"/> <el-table-column label="规格" align="center" prop="spec" v-if="false"/>