From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index c2e5ee3..29cc361 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -5,7 +5,7 @@
SELECT
qi.*,
<choose>
- <when test="qualityInspect.inspectType == 0">
+ <when test="qualityInspect.inspectType != 2">
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
@@ -65,7 +65,7 @@
AND (sl.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%')
OR po_sales.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%'))
</if>
- ORDER BY qi.check_time DESC
+ ORDER BY qi.create_time DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
@@ -471,5 +471,16 @@
</select>
+ <select id="selectProductModelById" resultType="com.ruoyi.basic.pojo.ProductModel">
+ SELECT id, product_id, model, unit
+ FROM product_model
+ WHERE id = #{id}
+ </select>
+
+ <select id="selectProductById" resultType="com.ruoyi.basic.pojo.Product">
+ SELECT id, product_name
+ FROM product
+ WHERE id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3