From 2d90ffa46399dce01b9a70e03fba282ef794cb92 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 11:11:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..9959018 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -96,9 +96,9 @@
.eq("loc_sts", "F")
.eq("loc_no", locNo)
.eq("barcode", param.getBarcode()));
- if (Cools.isEmpty(locMast)) {
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint());
- }
+// if (Cools.isEmpty(locMast)) {
+// return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint());
+// }
if (!locNoList.contains(locMast.getLocNo())) {
locNoList.add(locMast.getLocNo());
paramList.add(param);
@@ -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