From 55e7678db9fe57ad7c0ac96b3bba6ee78f629dd2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 08:44:27 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
index 835a6d8..69172ff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -374,6 +374,36 @@
return extend.getLock();
}
+ @Override
+ public boolean commandFinished(Integer taskNo) {
+ try {
+ LiftCommand command = getTaskClearCommand();
+ String loginToken = requestLoginToken();
+ if (loginToken == null) {
+ return false;
+ }
+
+ HashMap<String, Object> headers = new HashMap<>();
+ headers.put("Authorization", "Bearer " + loginToken);
+
+ String response = new HttpHandler.Builder()
+ .setUri(API_URL)
+ .setPath("/RDS/lifterOperation")
+ .setHeaders(headers)
+ .setJson(command.getBody())
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
//***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
//璇锋眰鐧诲綍
@@ -448,6 +478,8 @@
body.put("taskId", taskNo);
body.put("startLayer", 0);
body.put("endLayer", targetLev);
+ body.put("startLocation", 0);
+ body.put("endLocation", 0);
body.put("model", taskMode);
LiftCommand command = new LiftCommand();
@@ -469,6 +501,8 @@
body.put("taskId", taskNo);
body.put("startLayer", sourceLev);
body.put("endLayer", targetLev);
+ body.put("startLocation", 0);
+ body.put("endLocation", 0);
body.put("model", 2);//杞借溅绉诲姩
LiftCommand command = new LiftCommand();
@@ -540,6 +574,21 @@
return command;
}
+ //鑾峰彇鎻愬崌鏈轰换鍔℃竻闄ゅ懡浠�
+ private LiftCommand getTaskClearCommand() {
+ HashMap<String, Object> body = new HashMap<>();
+ body.put("messageName", "lifterOperation");
+ body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
+ body.put("operation", 1);
+
+ LiftCommand command = new LiftCommand();
+ command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
+ command.setBody(JSON.toJSONString(body));
+ command.setMode(LiftCommandModeType.RESET.id);
+ return command;
+ }
+
/**
* 鎵╁睍瀛楁
*/
--
Gitblit v1.9.1