Browse Source

命中已存在 NPI 物料时,不覆盖物料状态

master
han\hanst 1 week ago
parent
commit
a532d3fb6e
  1. 1
      src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleTrackingServiceImpl.java
  2. 15
      src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml

1
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);

15
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},

Loading…
Cancel
Save