From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/asrs/controller/MobileController.java | 57 ++++++++++++++++++++++++---------------------------------
1 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bab271d..7971216 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -464,51 +464,41 @@
*/
@RequestMapping("/AGVMove")
public R AGVMove(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String staNo){
- RCSParam rcsParam = new RCSParam();
- LocalDateTime now = LocalDateTime.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃� HH:mm:ss");
- String formattedDate = now.format(formatter); // 鏍煎紡鍖栨棩鏈熸椂闂�
- //缃戠粶娴佹按鍙�
- rcsParam.setReqId(now.toString());
- //搴旂敤鏍囪瘑
- rcsParam.setClientId("WMS");
- //閫氱煡鏃堕棿
- rcsParam.setReqTime(formattedDate);
- RCSParam.DataBody dataBody=new RCSParam.DataBody();
- //浠诲姟鍙�
- dataBody.setId(formattedDate);
+ ,@RequestParam(required = false) String staNo
+ ,Integer priority){
+ String noww="aa" + new Date().getTime();
- List<RCSParam.TaskBody> taskBodyList=new ArrayList<>();
- RCSParam.TaskBody taskBody=new RCSParam.TaskBody();
- //鍙栬揣绫诲瀷
- taskBody.setType("load");
- taskBody.setStation(sourceStaNo);
- taskBodyList.add(taskBody);
+ LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ rcsParam.put("task_id",noww);
+ rcsParam.put("start_location",sourceStaNo);
+ rcsParam.put("start_command",1);
+ rcsParam.put("target_location",staNo);
+ rcsParam.put("target_command",2);
+ rcsParam.put("priority",1);//浼樺厛绾ц秺灏忓厛鎵ц
+ rcsParam.put("robot_type",1);//杞� 杈� 绫� 鍨� 0:XC 1:XCD 2:XP_T 3:XP_L
+ rcsParam.put("MoverID","XCD");
- RCSParam.TaskBody taskBody1=new RCSParam.TaskBody();
- //鏀捐揣绫诲瀷
- taskBody1.setType("unload");
- taskBody1.setStation(staNo);
- taskBodyList.add(taskBody1);
-
- dataBody.setTasks(taskBodyList);
- rcsParam.setData(dataBody);
+ LinkedHashMap<String,Object> map=new LinkedHashMap<>();
+ map.put("data",rcsParam);
String response ="";
Boolean bool =false;
-
+ String msg = "";
try {
log.info("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍={}", rcsParam);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(url)
.setPath(attrcs)
- .setJson(JSON.toJSONString(rcsParam))
+ .setJson(JSON.toJSONString(map))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getBoolean("IsSuccess")){
+ JSONObject data = jsonObject.getJSONObject("data");
+ JSONObject errInfo = jsonObject.getJSONObject("err_info");
+ if(data.getInteger("result")==0){
bool = true;
+ }else{
+ msg=errInfo.getString("err_msg");
}
} catch (Exception e) {
log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触杩斿洖鍊�={}", response);
@@ -517,13 +507,14 @@
, url + attrcs
, null
, "127.0.0.1"
- , JSON.toJSONString(rcsParam)
+ , JSON.toJSONString(map)
, response
, bool
);
}
+
if(bool){
- return R.ok();
+ return R.ok(noww);
}else {
return R.error("涓嬪彂浠诲姟澶辫触");
}
--
Gitblit v1.9.1