2025-07-08

新增特殊管控:简化审批时，同意后，将stage改为Mass Production (copy_flag = 'Y')
归档按钮：点击归档后将stage改为Mass Production

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);
 

src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java

@@ -317,19 +317,19 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
     }
 
     @Override
-    public void doProcessControl(Integer roleId,String site,String orderNo){
-        if(roleId==1){
-            PlmTechnicalSpecificationSheetData check=requestManageMapper.getBomAndRouteFromBM(site,orderNo);
-            BomDetailVo checkBomOfficialFlag=requestManageMapper.checkBomOfficialFlag(check);
-            if(checkBomOfficialFlag==null){
+    public void doProcessControl(Integer roleId, String site, String orderNo, String copyFlag){
+        if (roleId == 1) {
+            PlmTechnicalSpecificationSheetData check = requestManageMapper.getBomAndRouteFromBM(site,orderNo);
+            BomDetailVo checkBomOfficialFlag = requestManageMapper.checkBomOfficialFlag(check);
+            if (checkBomOfficialFlag == null) {
                 throw new RuntimeException("技术参数卡未选择正式BOM");
             }
-            RoutingDetailVo  checkRoutingOfficialFlag=requestManageMapper.checkRoutingOfficialFlag(check);
-            if(checkRoutingOfficialFlag==null){
+            RoutingDetailVo checkRoutingOfficialFlag = requestManageMapper.checkRoutingOfficialFlag(check);
+            if (checkRoutingOfficialFlag == null) {
                 throw new RuntimeException("技术参数卡未选择正式工艺路线");
             }
         }
-        if(roleId==2){
+        if (roleId == 2 || (roleId == 8 && "Y".equals(copyFlag))) {
             requestManageMapper.updateBMStage(site,orderNo);
         }
     }

src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@@ -1213,4 +1213,6 @@ public interface TechnicalSpecificationMapper {
     Long TechnicalSpecificationCount(String sql);
 
     IPage<PlmTechnicalSpecificationSheetData> technicalSpecificationListSearchInPane(Page<PlmTechnicalSpecificationSheetData> plmTechnicalSpecificationSheetDataPage,@Param("query") PlmTechnicalSpecificationSheetData data);
+
+    void updateBMInfo(PlmTechnicalSpecificationSheetData data);
 }

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<PlmProcessControllBaseData> 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

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})
     </insert>
+
     <update id="updateBMStage">
-        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}
     </update>
 
     <select id="getBomAndRouteFromBM" resultType="PlmTechnicalSpecificationSheetData">

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -2210,55 +2210,56 @@
     </delete>
 
     <select id="selectTechnicalSpecification" resultType="PlmTechnicalSpecificationSheet">
-        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 @@
             </if>
         order by a.ori_code_no desc, a.rev_no desc
     </select>
+
+    <update id="updateBMInfo">
+        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}
+    </update>
 </mapper>