From a532d3fb6e75b57b2b3cc5490c6de41ba12c5675 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 18 Aug 2026 16:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=B8=AD=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=20NPI=20=E7=89=A9=E6=96=99=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SampleTrackingServiceImpl.java | 1 + .../sampletracking/SampleTrackingMapper.xml | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleTrackingServiceImpl.java b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleTrackingServiceImpl.java index bff0508f..0ee7e22d 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleTrackingServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleTrackingServiceImpl.java @@ -346,6 +346,7 @@ public class SampleTrackingServiceImpl implements SampleTrackingService { latestPart.setProjectId(npiProjectId); // 物料同步同样优先按业务键（site + projectId + testPartNo）定位，命中后执行更新。 // 仅在业务键未命中时，才按 trackingId == npiId 兼容旧数据。 + // 业务约束：命中已存在 NPI 物料时，不覆盖物料状态 Integer npiProjectPartId = resolveMatchedNpiProjectPartId(trackingProjectPartId, npiProjectId, latestPart); if (npiProjectPartId == null) { ProjectPart insertPart = buildProjectPartForInsert(latestPart, operator); diff --git a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml index 451287fd..9599fbc1 100644 --- a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml @@ -387,20 +387,6 @@ remark = #{remark}, need_date = #{needDate,jdbcType=DATE}, c_project_region = #{cProjectRegion}, - project_manager = #{projectManager}, - project_owner = #{projectOwner}, - engineer = #{engineer}, - c_quality_engineer1 = #{cQualityEngineer1}, - c_quality_engineer2 = #{cQualityEngineer2}, - c_quality_engineer3 = #{cQualityEngineer3}, - c_quality_engineer4 = #{cQualityEngineer4}, - c_quality_engineer5 = #{cQualityEngineer5}, - c_quality_engineer6 = #{cQualityEngineer6}, - c_manufacture_engineer = #{cManufactureEngineer}, - doc_engineer = #{docEngineer}, - doc_engineer2 = #{docEngineer2}, - ipqc_hard_tag = #{ipqcHardTag}, - c_quality_engineer7 = #{cQualityEngineer7}, project_creation_date = #{projectCreationDate,jdbcType=DATE}, project_close_date = #{projectCloseDate,jdbcType=DATE}, update_date = GETDATE(), @@ -489,7 +475,6 @@ c_manufacture_engineer = #{cManufactureEngineer}, close_date = #{closeDate,jdbcType=DATE}, engineer = #{engineer}, - status = #{status}, priority = #{priority}, project_category = #{projectCategory}, need_date = #{needDate,jdbcType=DATE},