From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 29f9c40..961d675 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -208,14 +208,20 @@
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
public R queryTask(@RequestHeader String appkey,
- @RequestParam String taskNo,
+ @RequestParam(required = false) String taskNo,
HttpServletRequest request) {
auth(appkey, taskNo, request);
+ List<TaskWrk> taskWrks = new ArrayList<>();
+ if (Cools.isEmpty(taskNo)) {
+ taskWrks = taskWrkService.selectList(new EntityWrapper<>());
+ return R.ok().add(taskWrks);
+ }
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
if (taskWrk == null) {
return R.error("浠诲姟涓嶅瓨鍦�");
}
- return R.ok().add(taskWrk);
+ taskWrks.add(taskWrk);
+ return R.ok().add(taskWrks);
}
//鏌ヨ浠诲姟鎸囦护闆嗗悎
--
Gitblit v1.9.1