diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java index e781ac7a..1def2682 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java @@ -1668,7 +1668,13 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic private void updateTrackingBaseInfo(ProofTrackingData data, ProofTrackingData oldData, String operateUser) { String site = isBlank(data.getSite()) ? oldData.getSite() : data.getSite(); - String proofingNo = isBlank(data.getProofingNo()) ? oldData.getProofingNo() : data.getProofingNo().trim(); + // 修改弹窗的清除按钮会提交空打样单号。空值表示用户主动清空,不能回退旧单号,否则保存后仍是原单号。 + String oldProofingNo = isBlank(oldData.getProofingNo()) ? null : oldData.getProofingNo().trim(); + String proofingNo = isBlank(data.getProofingNo()) ? null : data.getProofingNo().trim(); + if (!Objects.equals(oldProofingNo, proofingNo)) { + log.info("一键修改打样单号: trackingId={}, oldProofingNo={}, newProofingNo={}", + data.getTrackingId(), oldProofingNo, proofingNo); + } if (data.getProofingNumber() != null && data.getProofingNumber() <= 0) { throw new RuntimeException("数量必须是正整数"); } @@ -1679,7 +1685,17 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic updateData.setProofingNo(proofingNo); updateData.setProofingStatus(isBlank(data.getProofingStatus()) ? oldData.getProofingStatus() : data.getProofingStatus().trim()); updateData.setProofingNumber(data.getProofingNumber() == null ? oldData.getProofingNumber() : data.getProofingNumber()); - updateData.setPlanStartDate(data.getPlanStartDate() == null ? oldData.getPlanStartDate() : data.getPlanStartDate()); + // 打样单号已清空时,打样开始日期按提交值保存,空值表示同步清空,不能回退上一张试验单的日期。 + // 仍保留打样单号时,日期未传才沿用旧值,避免其它字段修改误清空开始日期。 + Date planStartDate = data.getPlanStartDate(); + if (!isBlank(proofingNo) && planStartDate == null) { + planStartDate = oldData.getPlanStartDate(); + } + if (isBlank(proofingNo) && !Objects.equals(oldData.getPlanStartDate(), planStartDate)) { + log.info("一键修改同步打样开始日期: trackingId={}, oldPlanStartDate={}, newPlanStartDate={}", + data.getTrackingId(), oldData.getPlanStartDate(), planStartDate); + } + updateData.setPlanStartDate(planStartDate); updateData.setRequiredDeliveryDate(data.getRequiredDeliveryDate() == null ? oldData.getRequiredDeliveryDate() : data.getRequiredDeliveryDate()); updateData.setBaseline(data.getBaseline() == null ? oldData.getBaseline() : data.getBaseline()); // 允许用户清空 PM inquery time,因此不以旧值兜底。 diff --git a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml index 8cae4679..b2be913b 100644 --- a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml @@ -590,9 +590,9 @@ UPDATE plm_proofing_information_tracking - SET project_phase = #{projectPhase}, + SET project_phase = #{projectPhase}, project_category = #{projectCategory}, - proofing_no = #{proofingNo}, + proofing_no = #{proofingNo,jdbcType=VARCHAR}, proofing_status = #{proofingStatus}, proofing_number = #{proofingNumber}, plan_start_date = #{planStartDate,jdbcType=DATE},