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

123456

This commit is contained in:
xd 2024-06-19 21:57:22 +08:00
parent ecd5881b10
commit 3d6351b34d
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,13 +1,5 @@
#for tests only !
<<<<<<< HEAD
#Wed Jun 19 10:12:57 CST 2024
=======
<<<<<<< HEAD
#Wed Jun 19 09:11:03 CST 2024
=======
#Mon Jun 17 15:48:27 CST 2024
>>>>>>> 1efe171bc013909adaa8e3300a0b9ce6c2e24d85
>>>>>>> d63db1c95090eda2578290808925b20b3608a764
#Wed Jun 19 20:15:41 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
jco.client.ashost=172.19.0.125
@ -15,13 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC
jco.client.sysnr=00
jco.destination.peak_limit=10
<<<<<<< HEAD
jco.client.passwd=dbTq!8PGYoMxt}M?DFv(:oQQUwH:qM9KKr$k^CHW9U;kE9uK
=======
<<<<<<< HEAD
jco.client.passwd=g}=[!8cY+]^Y:h6_:E9``X=J#eA[=IM/|(0EB`M)]I1i?/qD
=======
jco.client.passwd=654321
>>>>>>> 1efe171bc013909adaa8e3300a0b9ce6c2e24d85
>>>>>>> d63db1c95090eda2578290808925b20b3608a764
jco.client.passwd=fO[y6l4?vRT=RiyZx5)29/4S?-@n6ptS-pq0DsUMXTA4CDTk
jco.client.client=800

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -399,12 +399,12 @@ public class QuotController extends BaseController
// 提交报价时间限制
String commitQuotTime = configService.selectConfigByKey("quot.allow.commitQuotTime");
if(commitQuotTime.indexOf("-")<0){
return error("提交报价时间限制系统参数错误,格式不规范");
return error("提交报价时间限制系统参数错误-格式不规范,请联系管理员");
}
String startTime = commitQuotTime.split("-")[0];
String endTime = commitQuotTime.split("-")[1];
if(!DateUtils.isMatch(startTime) || !DateUtils.isMatch(endTime)){
return error("提交报价时间限制系统参数错误,格式不规范");
return error("提交报价时间限制系统参数错误-格式不规范,请联系管理员");
}
//当前时间

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java
View File

@ -283,6 +283,11 @@ public class RedBookController extends BaseController
List<OAQuotProduct> list = quot.getSelectedResultData();
File directory = new File("xjQuotFile/");
// 如果文件夹不存在，则创建文件夹
if (!directory.exists()) {
directory.mkdir();
}
excelFile = new File("xjQuotFile/"+xjquot.getQuotCode()+".xls");
File file = excelUtil.exportXjQuotExcel(response,excelFile,xjquot,list);
MultipartFile multipartFile = convert(file);

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

@ -782,9 +782,11 @@
// 生成询价单
handleMadeXjQuotClick() {
this.madeQuotDis = true;
this.form.selectedResultData = this.selectedResultData;
madeXjQuot(this.form).then(response => {
this.$modal.msgSuccess("生成询价单成功,单号:"+response.data.quotCode);
this.madeQuotDis = false;
});
},