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

'123'

This commit is contained in:
xd 2024-05-17 17:26:03 +08:00
parent 1d42c2f5d6
commit eb04079880
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,11 +1,11 @@
#for tests only ! #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.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
jco.client.passwd=wWOv8)*JSX[bw5-}QU!OM5!]2$[(}8v-{aXJ^%9]cN,q[/XI jco.client.passwd=654321
jco.client.client=800 jco.client.client=300

18
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="quotJsqrQtApprovalStatus" column="quot_jsqr_qt_approval_status" /> <result property="quotJsqrQtApprovalStatus" column="quot_jsqr_qt_approval_status" />
<result property="quotJsqrQtRemark" column="quot_jsqr_qt_remark" /> <result property="quotJsqrQtRemark" column="quot_jsqr_qt_remark" />
<result property="quotHjId" column="quot_ht_id" /> <result property="quotHjId" column="quot_hj_id" />
<result property="quotHjCode" column="quot_hj_code" /> <result property="quotHjCode" column="quot_hj_code" />
<result property="quotHjApprovalStatus" column="quot_hj_approval_status" /> <result property="quotHjApprovalStatus" column="quot_hj_approval_status" />
<result property="quotHjPricingDate" column="quot_hj_pricing_date" /> <result property="quotHjPricingDate" column="quot_hj_pricing_date" />
@ -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_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 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_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
</sql> </sql>
<sql id="selectQuotVo"> <sql id="selectQuotVo">
@ -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_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_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_code,h.quot_hj_pricing_date,
h.quot_hj_remark 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_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_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_code,h.quot_hj_pricing_date,
h.quot_hj_remark, h.quot_hj_remark,
@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quotJsxzGroupValues != null">quot_jsxz_group_values,</if> <if test="quotJsxzGroupValues != null">quot_jsxz_group_values,</if>
<if test="quotJsxzConfirmId != null">quot_jsxz_confirm_id,</if> <if test="quotJsxzConfirmId != null">quot_jsxz_confirm_id,</if>
<if test="quotHjId != null">quot_ht_id,</if> <if test="quotHjId != null">quot_hj_id,</if>
<if test="quotHjApprovalStatus != null">quot_hj_approval_status,</if> <if test="quotHjApprovalStatus != null">quot_hj_approval_status,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quotJsxzGroupValues != null">quot_jsxz_group_values = #{quotJsxzGroupValues},</if> <if test="quotJsxzGroupValues != null">quot_jsxz_group_values = #{quotJsxzGroupValues},</if>
<if test="quotJsxzConfirmId != null">quot_jsxz_confirm_id = #{quotJsxzConfirmId},</if> <if test="quotJsxzConfirmId != null">quot_jsxz_confirm_id = #{quotJsxzConfirmId},</if>
<if test="quotHjId != null">quot_ht_id = #{quotHjId},</if> <if test="quotHjId != null">quot_hj_id = #{quotHjId},</if>
<if test="quotHjApprovalStatus != null">quot_hj_approval_status = #{quotHjApprovalStatus},</if> <if test="quotHjApprovalStatus != null">quot_hj_approval_status = #{quotHjApprovalStatus},</if>
</trim> </trim>
where quot_id = #{quotId} 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_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_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_code,h.quot_hj_pricing_date,
h.quot_hj_remark, 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_zy_approval_status,q.quot_jsqr_zy_remark,
q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_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_code,h.quot_hj_pricing_date,
h.quot_hj_remark, h.quot_hj_remark,
@ -342,7 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from quot a from quot a
left join quot_material b on b.quot_id = a.quot_id left join quot_material b on b.quot_id = a.quot_id
<include refid="quotJoins"/> <include refid="quotJoins"/>
where a.quot_ht_id = #{quotHjId} where a.quot_hj_id = #{quotHjId}
</select> </select>
</mapper> </mapper>

5
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -1008,6 +1008,11 @@ export default {
commitForm() { commitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.quotMaterialList.length == 0 && this.quotXjFileList == 0){
this.$message.warning("无报价产品 或 未提交询价附件!");
return;
}
this.form.quotMaterialList = this.quotMaterialList; this.form.quotMaterialList = this.quotMaterialList;
commitQuot(this.form).then(response => { commitQuot(this.form).then(response => {
this.$modal.msgSuccess("提交成功"); this.$modal.msgSuccess("提交成功");