From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)
---
src/main/resources/mapper/sales/SalesQuotationMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index a39cd45..d4de9dd 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -4,16 +4,16 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
<select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
- SELECT * FROM sales_quotation
+ SELECT t1.*,
+ t2.approve_user_ids
+ FROM sales_quotation t1
+ LEFT JOIN approve_process t2 ON t1.quotation_no = t2.approve_reason and t2.approve_type = 6
WHERE 1=1
<if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
- AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
+ AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
</if>
<if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
- AND customer = #{salesQuotationDto.customer}
- </if>
- <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
- AND status = #{salesQuotationDto.status}
+ AND t1.customer = #{salesQuotationDto.customer}
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3