diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 479f9ceb..0ae003c8 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1274,4 +1274,6 @@ public interface TechnicalSpecificationMapper { List getRoutingGuideLineByLineDesc(@Param("site") String site, @Param("partNo") String partNo, @Param("routingRevision") Integer routingRevision, @Param("routingType") String routingType, @Param("alternativeNo") String alternativeNo, @Param("operationId") Integer operationId, @Param("dictLabel") String dictLabel); + + void bmStatusToCg(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index bf61918a..086e07af 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -2120,12 +2120,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Transactional public void bmStatusToCg(PlmTechnicalSpecificationSheetData data) { // 将技术参数卡的状态改为"草稿"状态 - data.setStatus("cg"); - technicalSpecificationMapper.updateStatus(data); - // 将技术参数卡的Step_id改为初始状态(空) + // ECN_flag 改为N,生产状态(stage)改为Sample + data.setStatus("cg"); data.setStepId(10); - technicalSpecificationMapper.updateBMStepId(data); +// technicalSpecificationMapper.updateStatus(data); +// technicalSpecificationMapper.updateBMStepId(data); + technicalSpecificationMapper.bmStatusToCg(data); // 将流程流转信息中is_remark为0的改为1 technicalSpecificationMapper.updateBMIsRemark(data); diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index d59261e6..276ddc82 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2796,6 +2796,17 @@ where site = #{site} and code_no = #{codeNo} + + update plm_technical_specification_sheet + set step_id = #{stepId}, + status = #{status}, + update_date = getDate(), + update_by = #{userName}, + ECN_flag = 'N', + stage = 'Sample' + where site = #{site} and code_no = #{codeNo} + + update plm_process_form set is_remark = 1