From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..a95f2dc 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();
@@ -184,14 +185,14 @@
task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
- task.setOriginSite(null);
- task.setOriginLoc(param.getSourceStaNo());
- task.setDestSite(param.getLiftTaskMode());
- task.setDestLoc(param.getStaNo());
+ task.setOriginSite(param.getSourceStaNo());
+ task.setOriginLoc(param.getSourceLev());
+ task.setDestSite(param.getStaNo());
+ task.setDestLoc(param.getTargetLev());
task.setIoTime(new Date());
task.setStartTime(new Date());
task.setStatus(1);
- task.setMemo("manual");
+ task.setMemo(param.getLiftTaskMode());
task.setLiftNo(liftNo);
boolean result = taskService.save(task);
if (!result) {
--
Gitblit v1.9.1