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 1b5ac61e..50941c05 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1061,4 +1061,17 @@ public class TechnicalSpecificationController { List rows= technicalSpecificationService.searchRouteDetail(data); return R.ok().put("rows", rows); } + + @PostMapping(value="/searchBMRemarkPage") + @ResponseBody + public R searchBMRemarkPage(@RequestBody PlmTechnicalSpecificationSheetData data){ + List rows= technicalSpecificationService.searchBMRemarkPage(data); + return R.ok().put("rows", rows); + } + @PostMapping(value="/updateBMRemarkPage") + @ResponseBody + public R updateBMRemarkPage(@RequestBody PlmTechnicalSpecificationSheetData data){ + technicalSpecificationService.updateBMRemarkPage(data); + return R.ok(); + } } 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 9eca4c20..684dff9f 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1102,4 +1102,8 @@ public interface TechnicalSpecificationMapper { * @throw */ List searchRouteDetail(RoutingDetailEntity data); + + List searchBMRemarkPage(PlmTechnicalSpecificationSheetData inData); + + void updateBMRemarkPage(PlmTechnicalSpecificationSheetData inData); } diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java index 4c4277c2..ec9fdcea 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java @@ -106,7 +106,7 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { private String routingType; private Integer routingRevision; private String routingAlternativeNo; - + private String remarkPage; public Integer getId() { return id; } @@ -322,5 +322,13 @@ public class PlmTechnicalSpecificationSheet extends QueryPage { public void setRoutingAlternativeNo(String routingAlternativeNo) { this.routingAlternativeNo = routingAlternativeNo; } + + public String getRemarkPage() { + return remarkPage; + } + + public void setRemarkPage(String remarkPage) { + this.remarkPage = remarkPage; + } } 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 bd015bf3..bf9fc722 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 @@ -936,4 +936,16 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public List searchRouteDetail(RoutingDetailEntity data){ return technicalSpecificationMapper.searchRouteDetail(data); } + + @Override + public List searchBMRemarkPage(PlmTechnicalSpecificationSheetData inData){ + return technicalSpecificationMapper.searchBMRemarkPage(inData); + } + + @Override + public void updateBMRemarkPage(PlmTechnicalSpecificationSheetData inData){ + technicalSpecificationMapper.updateBMRemarkPage(inData); + } + + } 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 b3fc0c24..4007ba0c 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -922,4 +922,8 @@ public interface TechnicalSpecificationService { * @throw */ List searchRouteDetail(RoutingDetailEntity data); + + List searchBMRemarkPage(PlmTechnicalSpecificationSheetData inData); + + void updateBMRemarkPage(PlmTechnicalSpecificationSheetData inData); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index c2fa6795..3db9e6a3 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -814,4 +814,11 @@ a.routing_alternative_no alternativeNo,b.final_part_no partNo where a.site=#{site} and a.part_no=#{partNo} and a.routing_type!='Repair' + + + update plm_technical_specification_sheet set remarkPage=#{remarkPage} where site=#{site} and code_no=#{codeNo} + + \ No newline at end of file