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/QualityUnqualifiedMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index f4fb205..b15e3f9 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -7,14 +7,20 @@
FROM quality_unqualified
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null ">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null ">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
+ </if>
+ <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+ AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+ AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
</if>
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
@@ -23,13 +29,13 @@
FROM quality_unqualified
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
--
Gitblit v1.9.3