From 66f550ed2bed934257390ff9e5ffa0515f984e95 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 25 Mar 2026 17:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=AB=E8=89=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/SynInspectInfoToQmsServiceImpl.java | 1 + src/main/resources/mapper/pms/QcMapper.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/heai/modules/pms/service/Impl/SynInspectInfoToQmsServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/SynInspectInfoToQmsServiceImpl.java index d295554..14ed850 100644 --- a/src/main/java/com/heai/modules/pms/service/Impl/SynInspectInfoToQmsServiceImpl.java +++ b/src/main/java/com/heai/modules/pms/service/Impl/SynInspectInfoToQmsServiceImpl.java @@ -192,6 +192,7 @@ public class SynInspectInfoToQmsServiceImpl implements SynInspectInfoToQmsServic templateData.setBuNo(data.getBuNo()); templateData.setTemplateId(firstPart.getTemplateId()); templateData.setItemType("D"); + templateData.setAttributeNo(data.getPartNo()); List itemList = qcMapper.templateDetailsSearch(templateData); List faiRecordDataList = new ArrayList<>(); for (QcTemplateData qcTemplateData : itemList) { diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index a55cfb0..e3a3a89 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -466,7 +466,7 @@ a.template_id, a.ItemNo, b.ItemDesc, - a.default_value, + ISNULL(ad.default_value,a.default_value) AS default_value , b.ValueType, b.ValueType_DB, a.max_value, @@ -483,11 +483,12 @@ b.default_sampling_proportion,a.order_id FROM qc_template_detailed a INNER JOIN eam_properties_item b ON a.ItemNo = b.ItemNo and a.site = b.site + left join qc_part_attr_detailed ad on ad.item_no = b.ItemNo and b.site = ad.site and ad.attribute_no =#{attributeNo} left join qc_sampling_inspection_programme as c on b.site = c.site and b.sampling_programme_no = c.sampling_programme_no left join qc_sampling_inspection_level as d on b.site = d.site and b.sampling_level_no = d.sampling_level_no LEFT JOIN eam_object eo ON a.object_id = eo.ObjectID and a.site = b.site WHERE a.template_id = #{templateId} AND b.ItemType = #{itemType} and a.site = #{site} - order by order_id,a.ItemNo + order by a.order_id,a.ItemNo