diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index d512ca69..89316b91 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -7,6 +7,7 @@ import com.spring.common.utils.R; import com.spring.modules.base.data.PlmBmModelHeaderData; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.part.entity.BomDetailEntity; +import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.BomComponentVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; @@ -1047,6 +1048,19 @@ public class TechnicalSpecificationController { technicalSpecificationService.updateBMRouteRev(data); return R.ok(); } - - + /** + * @Description 查询物料所有工艺路线 + * @Title searchRouteDetail + * @param data + * @author rq + * @date 2024/3/16 13:42 + * @return R + * @throw + */ + @PostMapping(value="/searchRouteDetail") + @ResponseBody + public R searchRouteDetail(@RequestBody RoutingDetailEntity data){ + List rows= technicalSpecificationService.searchRouteDetail(data); + return R.ok().put("rows", rows); + } } 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 bb7ee778..150072b4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1093,4 +1093,15 @@ public interface TechnicalSpecificationMapper { * @throw */ void updateBMRouteRev(PlmTechnicalSpecificationSheetData data); + + /** + * @Description TODO + * @Title 查询物料所有工艺路线 + * @param + * @author rq + * @date 2024/3/16 13:44 + * @return RoutingDetailEntity + * @throw + */ + List searchRouteDetail(RoutingDetailEntity 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 2784900c..84b5296a 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 @@ -910,15 +910,32 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public void updateBMBomRev(PlmTechnicalSpecificationSheetData data){ - technicalSpecificationMapper.updateBMBomRev(data); } @Override + @Transactional public void updateBMRouteRev(PlmTechnicalSpecificationSheetData data){ - technicalSpecificationMapper.updateBMRouteRev(data); + List params = new ArrayList<>(); + params.add(data.getSite()); + params.add(data.getCodeNo()); + params.add(data.getRoutingType()); + params.add(data.getRoutingRevision()); + params.add(data.getRoutingAlternativeNo()); + //执行方法 + List> resultList = procedureDao.getProcedureData("plm_bm_changeRouteRevNo", params); + //判断是否成功 + String code = String.valueOf(resultList.get(0).get("resultCode")); + if ("400".equalsIgnoreCase(code)) { + String msg = String.valueOf(resultList.get(0).get("resultMsg")); + throw new RuntimeException(msg); + } } + @Override + public List searchRouteDetail(RoutingDetailEntity data){ + return technicalSpecificationMapper.searchRouteDetail(data); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index e02ca3ac..97b502d4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -5,6 +5,7 @@ import com.spring.modules.base.data.PlmBmModelHeaderData; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; import com.spring.modules.part.entity.BomDetailEntity; +import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.BomComponentVo; import com.spring.modules.part.vo.PartInformationVo; import com.spring.modules.part.vo.RoutingComponentVo; @@ -912,4 +913,15 @@ public interface TechnicalSpecificationService { void updateBMBomRev(PlmTechnicalSpecificationSheetData data); void updateBMRouteRev(PlmTechnicalSpecificationSheetData data); + + /** + * @Description TODO + * @Title 查询物料所有工艺路线 + * @param + * @author rq + * @date 2024/3/16 13:44 + * @return RoutingDetailEntity + * @throw + */ + List searchRouteDetail(RoutingDetailEntity data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index f0e51278..b389c2de 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -807,4 +807,9 @@ a.routing_alternative_no alternativeNo,b.final_part_no partNo routing_alternative_no=#{routingAlternativeNo} where site=#{site} and code_no=#{codeNo} + + \ No newline at end of file