From 16ed2e0fee6c7e99b68d02bea6a54970d1ecf081 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 13:45:46 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8b60abe..d7599a0 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -121,7 +121,7 @@
HashMap<String, Object> r = new HashMap<>();
if (param.getStereoscopicTaskType() == 1) {
- //鍑哄簱浠诲姟鍒涘缓
+ //鍏ュ簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("type_no", 1)
.eq("crn_no", locMast.getCrnNo())
@@ -173,26 +173,31 @@
map.put("ErrorMessage", "浠诲姟绫诲瀷涓虹┖锛�");
return map;
}
- String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
- param.setStartPoint(fusion);
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if (Cools.isEmpty(locMast)) {
- map.put("ReturnStatus", 1);
- map.put("ErrorMessage", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
- return map;
+ if (param.getStereoscopicTaskType() == 2) {
+ String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
+ param.setStartPoint(fusion);
+ LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+ if (Cools.isEmpty(locMast)) {
+ map.put("ReturnStatus", 1);
+ map.put("ErrorMessage", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+ return map;
+ }
+ }else if (param.getStereoscopicTaskType() == 1){
+ String fusion = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
+ param.setStartPoint(fusion);
}
- HashMap<String, Object> r = new HashMap<>();
- if (param.getStereoscopicTaskType() == 2) {
+ HashMap<String, Object> r = new HashMap<>();
+ if (param.getStereoscopicTaskType() <= 2) {
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", 2)
- .eq("crn_no", locMast.getCrnNo())
+ .eq("type_no", param.getStereoscopicTaskType())
+ .eq("crn_no", 1)
.eq("stn_no", param.getTerminalNo()));
if (Cools.isEmpty(staDesc)) {
map.put("ReturnStatus", 1);
- map.put("ErrorMessage", "鍑哄簱璺姴涓嶅瓨鍦紒");
+ map.put("ErrorMessage", "鍑哄叆搴撹矾鍔蹭笉瀛樺湪锛�");
return map;
}
r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
@@ -203,7 +208,7 @@
String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
param.setTerminalNo(fusion1);
//绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
+ r = openService.taskCreate(new TaskCreateParam(param, 1));
if (r.get("ReturnStatus").equals(1)) {
return r;
}
--
Gitblit v1.9.1