From eb04079880046d7700f764d534e83286506761bb Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 17 May 2024 17:26:03 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 8 ++++---- .../main/resources/mapper/quot/QuotMapper.xml | 18 +++++++++--------- ruoyi-ui/src/views/quot/quot/index.vue | 5 +++++ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index ff6b17f..d815712 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,11 +1,11 @@ #for tests only ! -#Fri May 17 13:48:33 CST 2024 +#Fri May 17 16:58:54 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH -jco.client.ashost=172.19.0.125 +jco.client.ashost=172.19.0.120 jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=wWOv8)*JSX[bw5-}QU!OM5!]2$[(}8v-{aXJ^%9]cN,q[/XI -jco.client.client=800 +jco.client.passwd=654321 +jco.client.client=300 diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 2269d19..9c532d8 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user u2 on u2.user_name=a.quot_check_user_name left join sys_dept d on u.dept_id = d.dept_id left join quot_jsqr q on q.quot_jsqr_id = a.quot_jsxz_confirm_id - left join quot_hj h on h.quot_hj_id = a.quot_ht_id + left join quot_hj h on h.quot_hj_id = a.quot_hj_id @@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, - a.quot_ht_id,a.quot_hj_approval_status, + a.quot_hj_id,a.quot_hj_approval_status, h.quot_hj_code,h.quot_hj_pricing_date, h.quot_hj_remark @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, - a.quot_ht_id,a.quot_hj_approval_status, + a.quot_hj_id,a.quot_hj_approval_status, h.quot_hj_code,h.quot_hj_pricing_date, h.quot_hj_remark, @@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsxz_group_values, quot_jsxz_confirm_id, - quot_ht_id, + quot_hj_id, quot_hj_approval_status, @@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsxz_group_values = #{quotJsxzGroupValues}, quot_jsxz_confirm_id = #{quotJsxzConfirmId}, - quot_ht_id = #{quotHjId}, + quot_hj_id = #{quotHjId}, quot_hj_approval_status = #{quotHjApprovalStatus}, where quot_id = #{quotId} @@ -304,7 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, - a.quot_ht_id,a.quot_hj_approval_status, + a.quot_hj_id,a.quot_hj_approval_status, h.quot_hj_code,h.quot_hj_pricing_date, h.quot_hj_remark, @@ -332,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, - a.quot_ht_id,a.quot_hj_approval_status, + a.quot_hj_id,a.quot_hj_approval_status, h.quot_hj_code,h.quot_hj_pricing_date, h.quot_hj_remark, @@ -342,7 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from quot a left join quot_material b on b.quot_id = a.quot_id - where a.quot_ht_id = #{quotHjId} + where a.quot_hj_id = #{quotHjId} diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index f2f0453..fb82569 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -1008,6 +1008,11 @@ export default { commitForm() { this.$refs["form"].validate(valid => { if (valid) { + if(this.quotMaterialList.length == 0 && this.quotXjFileList == 0){ + this.$message.warning("无报价产品 或 未提交询价附件!"); + return; + } + this.form.quotMaterialList = this.quotMaterialList; commitQuot(this.form).then(response => { this.$modal.msgSuccess("提交成功");