From 144e723dc7635ceb14e8df585e83fda405d155a3 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 8 Jul 2025 11:23:44 +0800 Subject: [PATCH] =?UTF-8?q?2025-07-08=20=E6=96=B0=E5=A2=9E=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E7=AE=A1=E6=8E=A7:=E7=AE=80=E5=8C=96=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=97=B6=EF=BC=8C=E5=90=8C=E6=84=8F=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=B0=86stage=E6=94=B9=E4=B8=BAMass=20Production=20(copy=5Ffla?= =?UTF-8?q?g=20=3D=20'Y')=20=E5=BD=92=E6=A1=A3=E6=8C=89=E9=92=AE=EF=BC=9A?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BD=92=E6=A1=A3=E5=90=8E=E5=B0=86stage?= =?UTF-8?q?=E6=94=B9=E4=B8=BAMass=20Production?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/service/RequestManageService.java | 2 +- .../impl/RequestManageServiceImpl.java | 16 +-- .../dao/TechnicalSpecificationMapper.java | 2 + .../TechnicalSpecificationServiceImpl.java | 20 ++-- .../mapper/request/RequestManageMapper.xml | 5 +- .../TechnicalSpecificationMapper.xml | 109 ++++++++++-------- 6 files changed, 88 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/spring/modules/request/service/RequestManageService.java b/src/main/java/com/spring/modules/request/service/RequestManageService.java index c7abad60..1bd0ef41 100644 --- a/src/main/java/com/spring/modules/request/service/RequestManageService.java +++ b/src/main/java/com/spring/modules/request/service/RequestManageService.java @@ -109,7 +109,7 @@ public interface RequestManageService { * @return void * @throw */ - void doProcessControl(Integer roleId,String site,String orderNo); + void doProcessControl(Integer roleId, String site, String orderNo, String copyFlag); PageUtils getProcessFlowInformation(ProcessFormVo data); diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java index addb50b8..2910cf96 100644 --- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java +++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java @@ -317,19 +317,19 @@ public class RequestManageServiceImpl extends ServiceImpl technicalSpecificationListSearchInPane(Page plmTechnicalSpecificationSheetDataPage,@Param("query") PlmTechnicalSpecificationSheetData data); + + void updateBMInfo(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 e201b47e..b0450f10 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 @@ -1673,9 +1673,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification cData.setNodeId(paramData.getNodeId()); cData.setWorkflowId(paramData.getWorkflowId()); List controlList = requestManageService.getProcessSelect(cData); - if(!controlList.isEmpty()){ + if (!controlList.isEmpty()) { for (int i = 0; i < controlList.size(); i++) { - requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo()); + requestManageService.doProcessControl(controlList.get(i).getRoleId(), data.getSite(), data.getCodeNo(), changeRequest.getCopyFlag()); } } @@ -2044,13 +2044,19 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification */ @Override public void bmStatusToFinish(PlmTechnicalSpecificationSheetData data) { - // 将状态改为"已完成" +// // 将状态改为"已完成" +// data.setStatus("已完成"); +// // 更新单据状态和节点 +// technicalSpecificationMapper.updateStatus(data); +// // 2025-05-28 归档操作要更改step_id = NULL +// data.setStepId(null); +// technicalSpecificationMapper.updateBMStepId(data); + // 2025-07-08 点击归档后将stage改为Mass Production 合并上述修改 data.setStatus("已完成"); - // 更新单据状态和节点 - technicalSpecificationMapper.updateStatus(data); - // 2025-05-28 归档操作要更改step_id = NULL data.setStepId(null); - technicalSpecificationMapper.updateBMStepId(data); + data.setStage("Mass Production"); + technicalSpecificationMapper.updateBMInfo(data); + } @Override diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml index 420897a4..37d3a674 100644 --- a/src/main/resources/mapper/request/RequestManageMapper.xml +++ b/src/main/resources/mapper/request/RequestManageMapper.xml @@ -360,8 +360,11 @@ insert into plm_process_controll_value(site,workflow_id,node_id,role_id) values (#{site},#{workflowId},#{nodeId},#{roleId}) + - update plm_technical_specification_sheet set stage='Mass Production' where site=#{site} and code_no=#{orderNo} + update plm_technical_specification_sheet + set stage = 'Mass Production' + where site = #{site} and code_no = #{orderNo} - SELECT id, - site, - code_no, - proofing_no, - project_id, - test_part_no, - status, - rev_no, - work_center_no, - ECN_flag, - ECN_no, - ECN_address, - remark, - create_date, - create_by, - update_date, - update_by, - picture_addess, - customerPictureChangeRemark, - productionFileComments, - ori_code_no, - bom_type, - eng_chg_level, - bom_alternative_no, - routing_type, - routing_revision, - routing_alternative_no, - remarkPage, - process, - stage, - materialType, - cqcOperator, - faiOperator, - overPrintOperator, - printOperator, - peOperater, - csOperater, - step_id, - reject_flag, - reject_step_id, - mpOperator, - pod, - relevance_part_no, - ecn_upgrade_version, - ecn_need_change_drawing, - ecn_upgrade_flag, - url_file, - copy_flag, - shop_order + SELECT + id, + site, + code_no, + proofing_no, + project_id, + test_part_no, + status, + rev_no, + work_center_no, + ECN_flag, + ECN_no, + ECN_address, + remark, + create_date, + create_by, + update_date, + update_by, + picture_addess, + customerPictureChangeRemark, + productionFileComments, + ori_code_no, + bom_type, + eng_chg_level, + bom_alternative_no, + routing_type, + routing_revision, + routing_alternative_no, + remarkPage, + process, + stage, + materialType, + cqcOperator, + faiOperator, + overPrintOperator, + printOperator, + peOperater, + csOperater, + step_id, + reject_flag, + reject_step_id, + mpOperator, + pod, + relevance_part_no, + ecn_upgrade_version, + ecn_need_change_drawing, + ecn_upgrade_flag, + url_file, + copy_flag, + shop_order FROM plm_technical_specification_sheet a where a.site = #{site} and a.code_no = #{codeNo} @@ -2949,4 +2950,14 @@ order by a.ori_code_no desc, a.rev_no desc + + + update plm_technical_specification_sheet + set status = #{status}, + step_id = #{stepId}, + stage = #{stage}, + update_date = getDate(), + update_by = #{userName} + where site = #{site} and code_no = #{codeNo} + \ No newline at end of file