From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
index 6d52e63..bc1d3ff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.wcs.core.entity.TaskCtg;
import com.zy.asrs.wcs.core.kernel.AnalyzeService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
+import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.BasLiftService;
import com.zy.asrs.wcs.core.service.MotionService;
@@ -135,10 +136,10 @@
@PreAuthorize("hasAuthority('core:basLift:list')")
@PostMapping("/basLift/getMapLev")
public R getMapLev() {
- List<Dict> dicts = dictService.list(new LambdaQueryWrapper<Dict>()
- .like(Dict::getFlag, "map")
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>()
+ .like(Dict::getFlag, "liftOperaLev")
.eq(Dict::getStatus, 1));
- return R.ok().add(dicts.size());
+ return R.ok().add(dict.getValue());
}
@PreAuthorize("hasAuthority('core:basLift:operator')")
@@ -152,7 +153,7 @@
//鑾峰彇鎵嬪姩浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MANUAL")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MANUAL))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error();
--
Gitblit v1.9.1