diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java index 0767de58..f02f961c 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessColumnData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; -import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessValueData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -33,8 +32,6 @@ public interface SampleProofTrackingMapper { void updateProofTrackingPlanDates(ProofTrackingData data); - void updateProcessStatus(ProofTrackingProcessUpdateData data); - List selectProcessValuesByTrackingIds(@Param("trackingIds") List trackingIds); ProofTrackingProcessValueData selectProcessValueByTrackingAndCode(@Param("trackingId") Integer trackingId, @@ -48,8 +45,6 @@ public interface SampleProofTrackingMapper { void updateTrackingBaseInfo(ProofTrackingData data); - Integer countUnfinishedProcess(@Param("trackingId") Integer trackingId); - void finishProofing(@Param("trackingId") Integer trackingId, @Param("actualityDeliveryDate") Date actualityDeliveryDate, @Param("updateBy") String updateBy); @@ -64,10 +59,6 @@ public interface SampleProofTrackingMapper { ProofTrackingData selectTrackingForProofing(@Param("trackingId") Integer trackingId); - ProofTrackingData selectLatestTrackingByPart(@Param("site") String site, - @Param("projectId") Integer projectId, - @Param("projectPartId") Integer projectPartId); - void insertTrackingFromPart(ProofTrackingData data); ProofTrackingData selectProofingByNo(@Param("proofingNo") String proofingNo, @Param("site") String site); diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleTrackingMapper.java b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleTrackingMapper.java index cce3c5ad..abb1a191 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleTrackingMapper.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleTrackingMapper.java @@ -47,8 +47,6 @@ public interface SampleTrackingMapper { Integer selectNpiProjectIdBySiteAndProjectNo(@Param("site") String site, @Param("projectNo") String projectNo); - void insertNpiProjectFromTracking(ProjectInfoTrackingData data); - void updateNpiProjectFromTracking(ProjectInfoTrackingData data); Integer existsProjectInfoTrackingId(@Param("projectId") Integer projectId); @@ -73,8 +71,6 @@ public interface SampleTrackingMapper { @Param("projectId") Integer projectId, @Param("testPartNo") String testPartNo); - void insertNpiProjectPartFromTracking(ProjectPartTrackingData data); - void updateNpiProjectPartFromTracking(ProjectPartTrackingData data); Integer existsProjectPartTrackingId(@Param("projectPartId") Integer projectPartId); 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 84c18444..04e61fcc 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 @@ -766,9 +766,6 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic if (isBlank(data.getProjectPhase())) { data.setProjectPhase("Sample"); } - /* if (data.getProofingNumber() == null || data.getProofingNumber() <= 0) { - data.setProofingNumber(1); - }*/ if (data.getPlanStartDate() == null) { data.setPlanStartDate(new Date()); } diff --git a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml index 8f2a8e3f..039c322e 100644 --- a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml @@ -221,13 +221,6 @@ WHERE id = #{trackingId} - - UPDATE plm_proofing_information_tracking - SET update_date = GETDATE(), - update_by = #{updateBy} - WHERE id = #{trackingId} - - - SELECT COUNT(1) AS unfinished_count - FROM plm_proofing_process_value - WHERE tracking_id = #{trackingId} - AND ISNULL(process_status, N'未完成') NOT IN (N'已完成', N'打样完成') - - UPDATE plm_proofing_information_tracking SET proofing_status = N'打样完成', @@ -388,49 +374,6 @@ WHERE t.id = #{trackingId} - - SELECT ISNULL(MAX(CASE WHEN id >= 100000 THEN id END), 100000) + 1 diff --git a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml index 26b2b5dd..980ea2d9 100644 --- a/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleTrackingMapper.xml @@ -347,26 +347,6 @@ ORDER BY id DESC - - - SELECT CAST(SCOPE_IDENTITY() AS INT) - - INSERT INTO plm_project_info - (site,bu_no,project_no,ori_project_id,project_category,project_name,project_desc,status,project_source, - customer_no,final_customer_id,priority,remark,need_date,c_project_region,project_manager,project_owner, - engineer,c_quality_engineer1,c_quality_engineer2,c_quality_engineer3,c_quality_engineer4,c_quality_engineer5, - c_quality_engineer6,c_manufacture_engineer,doc_engineer,ipqc_hard_tag,c_quality_engineer7,doc_engineer2, - project_creation_date,project_close_date,create_date,create_by,update_date,update_by) - VALUES - (#{site},#{buNo},#{projectNo},#{oriProjectId},#{projectCategory},#{projectName},#{projectDesc},#{status}, - #{projectSource},#{customerNo},#{finalCustomerId},#{priority},#{remark},#{needDate,jdbcType=DATE},#{cProjectRegion}, - #{projectManager},#{projectOwner},#{engineer},#{cQualityEngineer1},#{cQualityEngineer2}, - #{cQualityEngineer3},#{cQualityEngineer4},#{cQualityEngineer5},#{cQualityEngineer6}, - #{cManufactureEngineer},#{docEngineer},#{ipqcHardTag},#{cQualityEngineer7},#{docEngineer2}, - #{projectCreationDate,jdbcType=DATE},#{projectCloseDate,jdbcType=DATE}, - ISNULL(#{createDate,jdbcType=TIMESTAMP}, GETDATE()),#{createBy},GETDATE(),#{updateBy}) - - UPDATE plm_project_info SET bu_no = #{buNo}, @@ -455,27 +435,6 @@ ORDER BY id DESC - - - SELECT CAST(SCOPE_IDENTITY() AS INT) - - INSERT INTO plm_project_part - (site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,final_part_desc, - create_date,create_by,update_date,update_by,part_name,final_part_no,code_no,group_id,product_group_id1, - product_group_id2,base_no,rev_no,project_manager,project_owner,build_date,c_quality_engineer1, - c_quality_engineer2,c_quality_engineer3,c_manufacture_engineer,close_date,engineer,status,priority, - project_category,need_date,doc_engineer,c_quality_engineer4,c_quality_engineer5,c_quality_engineer6, - customer_no,ipqc_hard_tag,c_quality_engineer7,doc_engineer2,remark) - VALUES - (#{site},#{projectId},#{testPartNo},#{partType},#{partDesc},#{partSpec},#{materialNumber},#{finalPartDesc}, - ISNULL(#{createDate,jdbcType=TIMESTAMP}, GETDATE()),#{createBy},GETDATE(),#{updateBy},#{partName}, - #{finalPartNo},#{codeNo},#{groupId},#{productGroupId1},#{productGroupId2},#{baseNo},#{revNo}, - #{projectManager},#{projectOwner},#{buildDate,jdbcType=DATE},#{cQualityEngineer1},#{cQualityEngineer2}, - #{cQualityEngineer3},#{cManufactureEngineer},#{closeDate,jdbcType=DATE},#{engineer},#{status},#{priority}, - #{projectCategory},#{needDate,jdbcType=DATE},#{docEngineer},#{cQualityEngineer4},#{cQualityEngineer5}, - #{cQualityEngineer6},#{customerNo},#{ipqcHardTag},#{cQualityEngineer7},#{docEngineer2},#{remark}) - - UPDATE plm_project_part SET site = #{site},