From 0663f737575f78b5c232bfc75038344a4168ae0d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 29 Jun 2024 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-29=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xujie/sys/modules/pms/mapper/QcMapper.java | 6 +++++- .../pms/service/Impl/QcServiceImpl.java | 10 +++++++++- src/main/resources/mapper/pms/QcMapper.xml | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index f81b1fdf..cdc66dbe 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -114,7 +114,7 @@ public interface QcMapper { QcTemplateData selectDetail(QcTemplateData data); - void saveItemDetailed(QcTemplateData data); + void saveItemDetailed(List data); IPage samplingQtySearch(Page page, @Param("query") QcSamplingInspectionQtyData data); @@ -548,4 +548,8 @@ public interface QcMapper { List getInspectionNoByItem(QcFAIRecordData data); List dataAcquisitionB(EquipmentDataAcquisitionData tempAcquisitionData); + + void delTemplateItem(QcTemplateData data); + + void deleteInspectionStandard2(QcTemplateData qcData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 10e2f466..e6bc300f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -675,9 +675,13 @@ public class QcServiceImpl implements QcService { qcData.setItemType(data.getItemType()); qcData.setTemplateId(data.getTemplateId()); qcMapper.delItemDetails(qcData); + // 删除判定标准 + qcMapper.deleteInspectionStandard2(qcData); } } else { // 单条删除 qcMapper.delItemDetails(data); + // 删除判定标准 + qcMapper.deleteInspectionStandard2(data); } } @@ -749,8 +753,12 @@ public class QcServiceImpl implements QcService { * @return: void **/ @Override + @Transactional public void saveItemDetailed(QcTemplateData data) { - qcMapper.saveItemDetailed(data); + // 先删除 + qcMapper.delTemplateItem(data); + // 新增 + qcMapper.saveItemDetailed(data.getItemList()); } /** diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index c3b37409..14404f11 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -634,7 +634,20 @@ AND template_version = #{templateVersion} + + delete qc_template_detailed + WHERE template_id = #{templateId} and site = #{site} and bu_no = #{buNo} + + + + INSERT INTO qc_template_detailed + (site, bu_no, template_id, ItemNo, default_value, max_value, min_value) + VALUES + + (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue}, #{item.minValue}) + + UPDATE qc_template_detailed SET default_value = #{defaultValue}, @@ -3755,6 +3768,11 @@ where site = #{site} and bu_no = #{buNo} and template_id = #{templateId} and item_no = #{itemNo} + + delete from qc_inspection_standards + where site = #{site} and bu_no = #{buNo} and template_id = #{templateId} and item_no = #{itemNo} + + INSERT INTO qc_inspection_standards (site, bu_no, template_id, item_no, default_value, min_value, max_value, condition, collection_source, seq_no)