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 f658aeb9..fb670748 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1224,8 +1224,8 @@ public class TechnicalSpecificationController { @PostMapping(value="/searchCopyPart") @ResponseBody public R searchCopyPart(@RequestBody PlmTechnicalSpecificationSheetData data) { - List rows= technicalSpecificationService.searchCopyPart(data); - return R.ok().put("rows",rows); + PageUtils page = technicalSpecificationService.searchCopyPart(data); + return R.ok().put("page", page); } /** 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 b6f4548d..7b7c6646 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1155,7 +1155,7 @@ public interface TechnicalSpecificationMapper { PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); - List searchCopyPart(PlmTechnicalSpecificationSheetData inData); + IPage searchCopyPart(Page technicalSpecificationDataPage, @Param("query") PlmTechnicalSpecificationSheetData data); String queryCustomerPartNo(@Param("site") String site, @Param("partNo") String partNo, 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 650e7230..a17a3742 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 @@ -1479,8 +1479,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } @Override - public List searchCopyPart(PlmTechnicalSpecificationSheetData inData){ - return technicalSpecificationMapper.searchCopyPart(inData); + public PageUtils searchCopyPart(PlmTechnicalSpecificationSheetData inData){ + // 技术参数卡中的copy功能,不管控到项目,可以copy到任意项目中的物料 -- 2025-05-26 + //return technicalSpecificationMapper.searchCopyPart(inData); + IPage resultList = this.technicalSpecificationMapper.searchCopyPart(new Page(inData.getPage(), inData.getLimit()), inData); + return new PageUtils(resultList); } @Override 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 beea7031..26cd5d70 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -975,7 +975,7 @@ public interface TechnicalSpecificationService { PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); - List searchCopyPart(PlmTechnicalSpecificationSheetData inData); + PageUtils searchCopyPart(PlmTechnicalSpecificationSheetData inData); void copyBm (PlmTechnicalSpecificationSheetData data); diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 809e3bcc..3353462d 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2256,20 +2256,46 @@