From e49d4bafff4317c604e1c8ca88f8ba09f0793613 Mon Sep 17 00:00:00 2001 From: Yxq <2290299376@qq.com> Date: Sat, 11 Oct 2025 16:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wms/DataController.java | 26 ++++++++++++++++--- .../controller/IDataControllerService.java | 15 ++++++++++- .../DataControllerServiceImpl.java | 17 +++++++++++- 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/DataController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/DataController.java index 0ff8d17..e479cdd 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/DataController.java +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/DataController.java @@ -50,15 +50,33 @@ public class DataController { /** * 获取拣选任务 */ - @GetMapping("/getPickTaskData") - public Object getPickTaskData(@RequestParam(defaultValue = "1") int pageNum, - @RequestParam(defaultValue = "10") int pageSize) { + @GetMapping("/getPickTaskDataP1") + public Object getPickTaskDataP1(@RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { try { - return dataControllerService.getPickTaskData(pageNum, pageSize); + return dataControllerService.getPickTaskDataP1(pageNum, pageSize); } catch (Exception e) { return "获取拣选任务失败: " + e.getMessage(); } } + @GetMapping("/getPickTaskDataP2") + public Object getPickTaskDataP2(@RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { + try { + return dataControllerService.getPickTaskDataP2(pageNum, pageSize); + } catch (Exception e) { + return "获取拣选任务失败: " + e.getMessage(); + } + } + @GetMapping("/getPickTaskDataP3") + public Object getPickTaskDataP3(@RequestParam(defaultValue = "1") int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { + try { + return dataControllerService.getPickTaskDataP3(pageNum, pageSize); + } catch (Exception e) { + return "获取拣选任务失败: " + e.getMessage(); + } + } } diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IDataControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IDataControllerService.java index 5a099fb..d8c5c79 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IDataControllerService.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IDataControllerService.java @@ -26,5 +26,18 @@ public interface IDataControllerService { * 获取拣选任务信息 * @return 拣选任务信息 */ - List getPickTaskData(int pageNum, int pageSize); + List getPickTaskDataP1(int pageNum, int pageSize); + + + /** + * 获取拣选任务信息 + * @return 拣选任务信息 + */ + List getPickTaskDataP2(int pageNum, int pageSize); + + /** + * 获取拣选任务信息 + * @return 拣选任务信息 + */ + List getPickTaskDataP3(int pageNum, int pageSize); } diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/DataControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/DataControllerServiceImpl.java index 956e51d..77ee6ea 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/DataControllerServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/DataControllerServiceImpl.java @@ -52,8 +52,23 @@ public class DataControllerServiceImpl implements IDataControllerService { * @return 拣选任务数据列表 */ @Override - public List getPickTaskData(int pageNum, int pageSize) { + public List getPickTaskDataP1(int pageNum, int pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(TAppPickTask::getPickStand, "P11", "P12", "P13"); + return tAppPickTaskService.page(new Page<>(pageNum, pageSize), queryWrapper).getRecords(); + } + + @Override + public List getPickTaskDataP2(int pageNum, int pageSize) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(TAppPickTask::getPickStand, "P14", "P15", "P16"); + return tAppPickTaskService.page(new Page<>(pageNum, pageSize), queryWrapper).getRecords(); + } + + @Override + public List getPickTaskDataP3(int pageNum, int pageSize) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(TAppPickTask::getPickStand, "P17", "P18", "P19"); return tAppPickTaskService.page(new Page<>(pageNum, pageSize), queryWrapper).getRecords(); } }