From e69c7673b787e628f67baf1d96f6341bc1bc639e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 17 Sep 2025 17:20:48 +0800 Subject: [PATCH] =?UTF-8?q?2025-09-17=20Routing=E5=8F=8D=E5=90=91=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0=E6=9B=BF=E4=BB=A3=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/mapper/RoutingManagementMapper.java | 2 ++ .../impl/RoutingManagementServiceImpl.java | 24 ++++++++++++++++++- .../mapper/part/RoutingManagementMapper.xml | 6 +++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java b/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java index e7b74b77..dd9a5f03 100644 --- a/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java +++ b/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java @@ -21,6 +21,8 @@ import java.util.Map; @Mapper public interface RoutingManagementMapper extends BaseMapper { + void updateRoutingDetailStatus(RoutingDetailVo data); + IPage routingManagementSearch(Page routingManagementVoPage, @Param("query") RoutingHeaderVo data); IPage queryPartList(Page partInformationVoPage, @Param("query") PartInformationEntity data); diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java index 9aaa8ca4..06ab435c 100644 --- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.spring.modules.part.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -1738,6 +1739,22 @@ public class RoutingManagementServiceImpl extends ServiceImpl syncRoutingInfoIfsToPlm(RoutingDetailVo data) { Server srv = getIfsServer(data.getUpdateBy()); + // 更新Routing替代的状态 + RoutingIfsAlternative routingIfsAlternative = new RoutingIfsAlternative(); + routingIfsAlternative.setContract(data.getSite()); + routingIfsAlternative.setPartNo(data.getPartNo()); + routingIfsAlternative.setRoutingRevision(data.getRoutingRevision().toString()); + routingIfsAlternative.setRoutingType(data.getRoutingType()); + routingIfsAlternative.setAlternativeNo(data.getAlternativeNo()); + Map getRoutingDetailResponse = routingServiceBean.getRoutingAlternative(srv, routingIfsAlternative); + if ("200".equals(getRoutingDetailResponse.get("resultCode"))) { // 存在 + RoutingIfsAlternative ifsAlternative = JSONObject.parseObject(getRoutingDetailResponse.get("obj"), RoutingIfsAlternative.class); + if (ifsAlternative != null) { + data.setStatus(ifsAlternative.getState()); + routingManagementMapper.updateRoutingDetailStatus(data); + } + } + // 根据替代删除plm的Routing子明细 RoutingAllFieldEntity routingData = new RoutingAllFieldEntity(); BeanUtils.copyProperties(data, routingData); @@ -1847,8 +1864,13 @@ public class RoutingManagementServiceImpl extends ServiceImpl map = new HashMap<>(); + // 查替代数据 + RoutingDetailEntity RoutingAlternative = routingManagementMapper.queryDetailDataByNo(data); + map.put("detailData", RoutingAlternative); + // 查子明细 List subDetailList = routingManagementMapper.queryRoutingComponent(data); // 返回值 map.put("subDetailList", subDetailList); diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index c082d4d4..a7f572bb 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -2034,4 +2034,10 @@ delete from plm_routing_component_copy where site = #{site} and user_name = #{updateBy} + + + update plm_routing_detail + set status = #{status}, update_date = getdate() + where site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and alternative_no = #{alternativeNo} +