From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/mapper/quality/QualityTestStandardMapper.xml | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index 96448f5..5c20733 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -7,18 +7,29 @@
FROM quality_test_standard
where
1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
+ <if test="c.standardNo != null and c.standardNo != '' ">
+ AND standard_no like concat('%',#{c.standardNo},'%')
+ </if>
+ <if test="c.standardName != null and c.standardName != '' ">
+ AND standard_name like concat('%',#{c.standardName},'%')
+ </if>
+ <if test="c.state != null ">
+ AND state =#{c.state}
+ </if>
+ <if test="c.inspectType != null ">
+ AND inspect_type =#{c.inspectType}
</if>
</select>
- <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
- SELECT
- *
- FROM quality_test_standard
- where
- 1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
+ <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
+ SELECT qts.*
+ FROM quality_test_standard qts
+ left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
+ left join product_process pp on qts.process_id = pp.id
+ WHERE qtsb.product_id = #{productId}
+ AND qts.inspect_type = #{inspectType}
+ <if test="process!='' and process!=null">
+ and pp.name = #{process}
</if>
+ order by qts.id desc
</select>
</mapper>
--
Gitblit v1.9.3