Merge remote-tracking branch '惠信/qms/develop' into qms/develop
This commit is contained in:
commit
bae76d6707
|
|
@ -56,7 +56,7 @@
|
||||||
t.inspection_enable IN (0, 1)
|
t.inspection_enable IN (0, 1)
|
||||||
OR (
|
OR (
|
||||||
t.inspection_enable = 2
|
t.inspection_enable = 2
|
||||||
AND t.inspection_inspection = '合格'
|
AND t.inspection_inspection = true
|
||||||
AND NOT EXISTS (
|
AND NOT EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM qms_pdi_inspection_results ir
|
FROM qms_pdi_inspection_results ir
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
<where>
|
<where>
|
||||||
<!-- 固定条件:已完成 + 不合格 + 存在不合格检测项 -->
|
<!-- 固定条件:已完成 + 不合格 + 存在不合格检测项 -->
|
||||||
AND t.inspection_enable = 2
|
AND t.inspection_enable = 2
|
||||||
AND t.inspection_inspection = '不合格'
|
AND t.inspection_inspection = false
|
||||||
AND EXISTS (
|
AND EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM qms_pdi_inspection_results ir
|
FROM qms_pdi_inspection_results ir
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue