From 6d3a76f894052209cad136ec9bff6ddcd43fc4e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 四月 2026 17:55:48 +0800
Subject: [PATCH] feat: 扫码时做限制，若采购台账已全部质检入库，APP扫码 入库时提示已入库。并且联动质检
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 0ccfbea..99d6df1 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -6,10 +6,12 @@
qi.*,
<choose>
<when test="qualityInspect.inspectType == 0">
- pl.purchase_contract_number as purchase_contract_no
+ pl.purchase_contract_number as purchase_contract_no,
+ pm.thickness
</when>
<otherwise>
- pwo.work_order_no
+ pwo.work_order_no,
+ pm.thickness
</otherwise>
</choose>
FROM
@@ -17,10 +19,12 @@
<choose>
<when test="qualityInspect.inspectType == 0 ">
LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
+ LEFT JOIN product_model pm ON pm.id = qi.product_model_id
</when>
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_model pm ON pm.id = qi.product_model_id
</otherwise>
</choose>
WHERE
@@ -43,7 +47,7 @@
<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
- ORDER BY qi.check_time DESC
+ ORDER BY qi.id DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
--
Gitblit v1.9.3