From 6efef82561e2cf14f09871d63e1581c6174cfe10 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 25 六月 2025 15:01:53 +0800
Subject: [PATCH] 第二版本
---
src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java b/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
index c5df7f8..645bdfc 100644
--- a/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
+++ b/src/main/java/com/zy/asrs/task/newWay/handler/AssignTasksToRCSHandler.java
@@ -19,6 +19,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
@Slf4j
@@ -35,61 +36,63 @@
private String attrcs;
public ReturnT<String> start(WrkMast wrkMast) {
- RCSParam rcsParam = new RCSParam();
LocalDateTime now = LocalDateTime.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃� HH:mm:ss");
+ String noww="bb" + new Date().getTime();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd 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(wrkMast.getWrkNo()+"");
- List<RCSParam.TaskBody> taskBodyList=new ArrayList<>();
- RCSParam.TaskBody taskBody=new RCSParam.TaskBody();
- //鍙栬揣绫诲瀷
- taskBody.setType("load");
- taskBody.setStation(wrkMast.getStaNo()+"");
- taskBodyList.add(taskBody);
+ LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ rcsParam.put("task_id",noww);
+ rcsParam.put("start_location","102");
+ rcsParam.put("start_site_level",1);
+ rcsParam.put("start_command",1);
+ rcsParam.put("target_location",wrkMast.getMemo());
+ rcsParam.put("target_site_level",1);
+ rcsParam.put("target_command",2);
+ rcsParam.put("priority",1);
+ rcsParam.put("robot_type",3);//杞� 杈� 绫� 鍨� 0:XC 1:XCD 2:XP_T 3:XP_L
+ rcsParam.put("MoverID","XS1");
- RCSParam.TaskBody taskBody1=new RCSParam.TaskBody();
- //鏀捐揣绫诲瀷
- taskBody1.setType("unload");
- taskBody1.setStation(wrkMast.getMemo());
- 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 = "";
+ wrkMast.setPauseMk(noww);
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")){
- wrkMast.setWrkSts(15L);//WMS涓嬪彂鎼繍浠诲姟缁橰CS鎴愬姛,杞巻鍙叉。
+ JSONObject data = jsonObject.getJSONObject("data");
+ JSONObject errInfo = jsonObject.getJSONObject("err_info");
+ if(data.getInteger("result")==0){
+ if(wrkMast.getIoType()==103||wrkMast.getIoType()==107){
+ wrkMast.setWrkSts(16L);//寰呭洖搴�
+ }else{
+ wrkMast.setWrkSts(15L);//涓嬪彂RCS-鎴愬姛
+ }
+
+ wrkMast.setErrorMemo(noww);
wrkMastService.updateById(wrkMast);
bool = true;
+ }else{
+ msg=errInfo.getString("err_msg");
}
} catch (Exception e) {
- log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触{},杩斿洖鍊�={}", wrkMast, response);
+ log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触杩斿洖鍊�={}", response);
} finally {
apiLogService.save("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍"
, url + attrcs
, null
, "127.0.0.1"
- , JSON.toJSONString(rcsParam)
+ , JSON.toJSONString(map)
, response
, bool
);
--
Gitblit v1.9.1