1127

src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.spring.modules.base.entity.PlmProcessControllBaseData;
 import com.spring.modules.base.entity.PlmProcessControllBaseDataIn;
+import com.spring.modules.part.vo.BomDetailVo;
+import com.spring.modules.part.vo.RoutingDetailVo;
 import com.spring.modules.request.entity.PlmFieldData;
 import com.spring.modules.request.entity.PlmRequestDetailEntity;
 import com.spring.modules.request.entity.PlmRequestHeaderEntity;
@@ -12,6 +14,7 @@ import com.spring.modules.request.entity.TableData;
 import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.request.vo.PlmRequestHeaderVo;
 import com.spring.modules.request.vo.TableDataVo;
+import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -153,4 +156,9 @@ public interface RequestManageMapper extends BaseMapper<PlmRequestHeaderEntity>
 
     void updateBMStage(@Param("site") String site,@Param("orderNo") String orderNo);
 
+    PlmTechnicalSpecificationSheetData getBomAndRouteFromBM(@Param("site") String site,@Param("codeNo") String codeNo);
+
+    BomDetailVo checkBomOfficialFlag(PlmTechnicalSpecificationSheetData inData);
+
+    RoutingDetailVo checkRoutingOfficialFlag(PlmTechnicalSpecificationSheetData inData);
 }

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

@@ -7,6 +7,8 @@ import com.spring.common.utils.PageUtils;
 import com.spring.modules.base.entity.PlmProcessControllBaseData;
 import com.spring.modules.base.entity.PlmProcessControllBaseDataIn;
 import com.spring.modules.base.service.TransNoControlService;
+import com.spring.modules.part.vo.BomDetailVo;
+import com.spring.modules.part.vo.RoutingDetailVo;
 import com.spring.modules.request.entity.PlmFieldData;
 import com.spring.modules.request.entity.PlmRequestDetailEntity;
 import com.spring.modules.request.entity.PlmRequestHeaderEntity;
@@ -16,6 +18,7 @@ import com.spring.modules.request.service.RequestManageService;
 import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.request.vo.PlmRequestHeaderVo;
 import com.spring.modules.request.vo.TableDataVo;
+import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -243,7 +246,15 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
     public List<PlmProcessControllBaseData> getProcessControlList(PlmProcessControllBaseData inData){
         return requestManageMapper.getProcessControlList(inData);
     }
-
+    /**
+     * @Description 查询节点的控制信息
+     * @Title getProcessSelect
+      * @param inData
+     * @author rq
+     * @date 2024/11/25 14:59
+     * @return List<PlmProcessControllBaseData>
+     * @throw
+     */
     @Override
     public List<PlmProcessControllBaseData> getProcessSelect(PlmProcessControllBaseData inData){
         return requestManageMapper.getProcessSelect(inData);
@@ -261,7 +272,15 @@ 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){
+                throw new RuntimeException("技术参数卡未选择正式BOM");
+            }
+            RoutingDetailVo  checkRoutingOfficialFlag=requestManageMapper.checkRoutingOfficialFlag(check);
+            if(checkRoutingOfficialFlag==null){
+                throw new RuntimeException("技术参数卡未选择正式工艺路线");
+            }
         }
         if(roleId==2){
             requestManageMapper.updateBMStage(site,orderNo);

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -33,6 +33,7 @@ import com.spring.modules.quotation.entity.QuotationHeader;
 import com.spring.modules.quotation.mapper.QuotationInformationMapper;
 import com.spring.modules.quotation.vo.QuotationDetailVo;
 import com.spring.modules.report.dao.ProcedureDao;
+import com.spring.modules.request.service.RequestManageService;
 import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.request.vo.PlmRequestHeaderVo;
 import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
@@ -74,7 +75,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     private BomManagementMapper bomManagementMapper;
     @Autowired
     private QuotationInformationMapper quotationInformationMapper;
-
+    @Autowired
+    private RequestManageService requestManageService;
     @Autowired
     private ChangeManagementMapper changeManagementMapper;
 
@@ -1258,6 +1260,17 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
                 changeRequest.getStepId(), data.getBu() == null ? "" : data.getBu(), baseData.get("domainControlAccount"), baseData.get("menuId"), data.getNodeConclusion(), data.getRejectOpinion() == null ? "" : data.getRejectOpinion(), data.getNodeId());
 
         if ("Y".equals(data.getNodeConclusion())) { // 同意
+            // 2024-11-25 RQ新增，判断是否有特殊控制
+            PlmProcessControllBaseData cData=new PlmProcessControllBaseData();
+            cData.setSite(data.getSite());
+            cData.setNodeId(paramData.getNodeId());
+            cData.setWorkflowId(paramData.getWorkflowId());
+            List<PlmProcessControllBaseData> controlList =  requestManageService.getProcessSelect(cData);
+            if(controlList.size()>0){
+                for (int i = 0; i < controlList.size(); i++) {
+                    requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo());
+                }
+            }
             // 创建 mainData
             List<MainData> mainData = new ArrayList<>();
             List<PlmRequestDetailVo> nodeDetails = changeManagementMapper.queryNodeDetails(data.getSite(), baseData.get("workflowId"), baseData.get("nodeId"), baseData.get("classificationNo"));

src/main/resources/mapper/request/RequestManageMapper.xml

@@ -356,4 +356,24 @@
     <update id="updateBMStage">
         update plm_technical_specification_sheet set stage='Mass Production'  where   site=#{site} and code_no=#{orderNo}
     </update>
+
+    <select id="getBomAndRouteFromBM" resultType="PlmTechnicalSpecificationSheetData">
+        select a.site,a.bom_type,a.eng_chg_level,a.bom_alternative_no,a.routing_type,a.routing_revision,a.routing_alternative_no
+        ,b.final_part_no
+        from plm_technical_specification_sheet a
+         left join plm_project_part b on a.site=b.site and a.test_part_no=b.test_part_no and a.project_id=b.project_id
+         where  site=#{site} and code_no=#{codeNo}
+
+    </select>
+
+    <select id="checkBomOfficialFlag" resultType="com.spring.modules.part.vo.BomDetailVo">
+        select site from plm_bom_detail where site=#{site} and part_no=#{finalPartNo} and bom_type=#{bomType}
+        and alternative_no=#{bomAlternativeNo} and eng_chg_level=#{engChgLevel,jdbcType=INTEGER}
+    </select>
+
+
+       <select id="checkRoutingOfficialFlag" resultType="com.spring.modules.part.vo.RoutingDetailVo">
+        select site from plm_routing_detail where site=#{site} and part_no=#{finalPartNo} and routing_type=#{routingType}
+        and alternative_no=#{routingAlternativeNo} and routing_revision=#{routingRevision,jdbcType=INTEGER}
+    </select>
 </mapper>