From 64f4079a20eb4499845182a5b91abbbbcf1b44fc Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 15:17:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 13cef9e..e9181b3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,7 +14,6 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -47,9 +46,6 @@
private LocMastService locMastService;
@Autowired
private BasCrnErrorService basCrnErrorService;
-
- @Value("${wms.url}")
- private String wmsUrl;
private static final boolean auth = true;
@@ -153,12 +149,12 @@
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
- openService.taskCreateIn(param);
+ HashMap<String, Object> result = openService.taskCreateIn(param);
+ return R.ok().add(result);
}catch (Exception e){
log.error("浠诲姟涓嬪彂寮傚父"+e);
- return R.error();
}
- return R.ok();
+ return R.error();
}
//鏌ヨ浠诲姟璇︽儏
@@ -211,7 +207,7 @@
map.put("Msg","浠诲姟绫诲瀷涓虹┖锛�");
return map;
}
- String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
+ String fusion = Utils.getLocNo(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
param.setStartPoint(fusion);
LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(Cools.isEmpty(locMast)){
@@ -238,7 +234,7 @@
return r;
}
}else if (param.getStereoscopicTaskType() == 3){
- String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
+ String fusion1 = Utils.getLocNo(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
param.setTerminalNo(fusion1);
//绉诲簱浠诲姟鍒涘缓
r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
--
Gitblit v1.9.1