diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index dfdbb4939..b2197f1b1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -146,6 +146,12 @@ public class OrderController { return success(BeanUtils.toBean(orderService.getOrderPage(pageReqVO), OrderRespVO.class)); } + @GetMapping("/webcad/page") + @Operation(summary = "获得生产单分页") + public CommonResult> webCadGetOrderPage(@Valid OrderPageReqVO pageReqVO) { + return success(BeanUtils.toBean(orderService.getOrderPage(pageReqVO), OrderRespVO.class)); + } + // 不做生产单是否作废判断 @GetMapping("/printing") @Operation(summary = "打印/导出 数据文件") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java index db283bf55..671ea0644 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java @@ -92,6 +92,14 @@ public class PartsController { return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); } + @GetMapping("/webcad/page") + @Operation(summary = "获得配件分页") + @PreAuthorize("@ss.hasAnyPermissions('system:accessory:query','base:accessory:query')") + public CommonResult> webcadGetPage(@Valid PartsPageReqVO pageReqVO) { + PageResult pageResult = partsService.getPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出配件文件") @PreAuthorize("@ss.hasAnyPermissions('system:accessory:export','base:accessory:export')") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java index ca8f70edd..31a1a4f2a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java @@ -93,6 +93,13 @@ public class PlateController { return success(BeanUtils.toBean(pageResult, PlateRespVO.class)); } + @GetMapping("/webcad/page") + @Operation(summary = "webcad获得板材信息分页") + public CommonResult> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) { + PageResult pageResult = plateService.getPlatePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PlateRespVO.class)); + } + @GetMapping("/export") @Operation(summary = "导出板材信息") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')") @@ -165,10 +172,9 @@ public class PlateController { } - @GetMapping("/all") + @GetMapping("/webcad/all") @Operation(summary = "获取全部板材信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") - public CommonResult> getPlateAll(@RequestParam("organId") Long organId) { + public CommonResult> webCadGetPlateAll(@RequestParam("organId") Long organId) { List list = plateService.getPlateAll(organId); return success(BeanUtils.toBean(list, PlateRespVO.class)); }