2025.1.21 文档收集 - 修改打样单号优化

src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java

@@ -28,7 +28,7 @@ public interface ProofingInformationMapper extends BaseMapper<ProofingInformatio
 
     void proofingInformationSave(ProofingInformationData data);
 
-    ProofingInformationData selecProofingOne(ProofingInformationData data);
+    ProofingInformationData selecProofingOne(Integer proofingId);
 
     void deleteDocumentType(EamBuDocumentListDefinitionVo data);
 
@@ -115,4 +115,6 @@ public interface ProofingInformationMapper extends BaseMapper<ProofingInformatio
 
     @Select("SELECT * FROM plm_document_list_definition WHERE project_id = #{projectId} and test_part_id = #{projectPartId} and proofing_id = #{proofingId}")
     List<ProofDocumentData> getUploadedFlagByPart(ProofingInformationData data);
+
+    ProofingInformationData selecProofingOneByNo(ProofingInformationData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java

@@ -48,7 +48,7 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic
         ProofingInformationData proofingInformationData;
         //判断打样单号是否重复
         try {
-            proofingInformationData = proofingInformationMapper.selecProofingOne(data);
+            proofingInformationData = proofingInformationMapper.selecProofingOneByNo(data);
         } catch (Exception e) {
             throw new RuntimeException("存在多个相同打样单号！ - " + e.getMessage(), e);
         }
@@ -101,8 +101,7 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic
     public R editProofingRecord(ProofingInformationData data, List<ProofDocumentData> proofDocumentDataList) {
         boolean deleteSuccessful = true;
         // 根据Id拿到旧数据
-        ProofingInformationData proofingInformationData = proofingInformationMapper.selecProofingOne(data);
-        proofingInformationData.setProofingId(data.getProofingId());
+        ProofingInformationData proofingInformationData = proofingInformationMapper.selecProofingOne(data.getProofingId());
         if (data.getType() != 1) {
             // 如果有旧记录且项目分类不同，进行删除操作
             if (proofingInformationData != null && !proofingInformationData.getcProjectTypeDb().equals(data.getcProjectTypeDb())) {

src/main/resources/mapper/pms/ProofingInformationMapper.xml

@@ -28,7 +28,7 @@
     </update>
     <update id="updateProofingInfoById1">
         UPDATE plm_proofing_information
-        SET
+        SET proofing_no = #{proofingNo},
             proofing_number = #{proofingNumber},
             plan_start_date = #{planStartDate},
             required_delivery_date = #{requiredDeliveryDate},
@@ -137,7 +137,7 @@
         DELETE FROM plm_document_list_definition WHERE id = #{documentDefinitionListId}
     </delete>
     <select id="selecProofingOne" resultType="com.xujie.sys.modules.pms.data.ProofingInformationData">
-        SELECT * FROM plm_proofing_information WHERE proofing_no = #{proofingNo}
+        SELECT * FROM plm_proofing_information WHERE id = #{proofingId}
     </select>
 
     <!-- 查询documentTypeId列表 -->
@@ -1045,4 +1045,7 @@
             resultType="com.xujie.sys.modules.pms.data.ProofDocumentData">
         Select a.username, a.user_display, a.user_id from sys_user as a left join access_role as b on a.username = b.username where b.role_no = 'R002' and a.site = #{site}
     </select>
+    <select id="selecProofingOneByNo" resultType="com.xujie.sys.modules.pms.data.ProofingInformationData">
+        SELECT * FROM plm_proofing_information WHERE proofing_no = #{proofingNo}
+    </select>
 </mapper>