diff --git a/src/main/java/com/spring/modules/part/controller/PartInformationController.java b/src/main/java/com/spring/modules/part/controller/PartInformationController.java index 36215b46..dbf57634 100644 --- a/src/main/java/com/spring/modules/part/controller/PartInformationController.java +++ b/src/main/java/com/spring/modules/part/controller/PartInformationController.java @@ -717,4 +717,16 @@ public class PartInformationController { public void downLoadFile(@RequestParam("id") Integer id, HttpServletResponse response) throws UnsupportedEncodingException { partInformationService.downLoadObjectFile(id,response); } + + /** + * 获取下一个物料revision + * @param inData + * @return + */ + @PostMapping("/getPartRevisionEngChgLevel") + @ResponseBody + public R getPartRevisionEngChgLevel(@RequestBody PartRevisionVo inData){ + Map map = partInformationService.getPartRevisionEngChgLevel(inData); + return R.ok().put("rows", map); + } } diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java index 5564390b..1bd0bf1c 100644 --- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java +++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java @@ -271,4 +271,6 @@ public interface PartInformationMapper extends BaseMapper String getNextPartNo2(PartInformationVo data); void delProjectPartByPartNo(@Param("site") String site, @Param("partNo") String partNo); + + List getMaxPartRevision(@Param("site") String site, @Param("partNo") String partNo); } diff --git a/src/main/java/com/spring/modules/part/service/PartInformationService.java b/src/main/java/com/spring/modules/part/service/PartInformationService.java index c9110420..3d757a0a 100644 --- a/src/main/java/com/spring/modules/part/service/PartInformationService.java +++ b/src/main/java/com/spring/modules/part/service/PartInformationService.java @@ -141,4 +141,6 @@ public interface PartInformationService { void downLoadObjectFile(Integer id, HttpServletResponse response) throws UnsupportedEncodingException; List getChangeRecordByPartNo2(PlmProjectPartData data); + + Map getPartRevisionEngChgLevel(PartRevisionVo inData); } diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index a2061ef0..d24c6e43 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -340,6 +340,7 @@ public class PartInformationServiceImpl extends ServiceImpl getPartRevisionEngChgLevel(PartRevisionVo inData) { + HashMap map = new HashMap<>(); + // 获取最大的partRevision + List revisionList = partInformationMapper.getMaxPartRevision(inData.getSite(), inData.getPartNo()); + + if (revisionList.isEmpty()) { + map.put("engChgLevel", 1); + map.put("engRevision", 1); + } else { + map.put("engChgLevel", revisionList.get(0).getEngChgLevel() + 1); + map.put("engRevision", revisionList.get(0).getEngChgLevel() + 1); + } + return map; + } + } diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index 93ae4ec0..e2e1f37a 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -1924,4 +1924,20 @@ delete from plm_project_part where site = #{site} and test_part_no = #{partNo} + + diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index 54bbc9cf..dd39403e 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -437,9 +437,9 @@ routing_type, alternative_no, status, - offical_flag + official_flag FROM plm_routing_detail - WHERE site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and offical_flag = 'Y' + WHERE site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and official_flag = 'Y'