From 82e14834b38c398f6bc75e8b7454a0b223be2a66 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十二月 2023 17:13:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 2741292..4c3b4fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -96,13 +96,18 @@
toWmsDTO.setApplyType("TUNNEL");
toWmsDTO.setWharfSource(null);
toWmsDTO.setCanInboundTunnels(list);
- String response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/inboundTaskApply")
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ return R.error("wms杩炴帴澶辫触"+e.getMessage());
+ }
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
@@ -128,7 +133,7 @@
map.put("J-1107",114);map.put("J-1108",113);
map.put("J-1109",118);map.put("J-1110",117);
map.put("J-1111",122);map.put("J-1112",121);
-
+ map.put("H-1101",305);map.put("H-1102",300);
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 鑾峰彇鍏ュ簱绔欎俊鎭�
@@ -150,7 +155,7 @@
}else {
if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
//AGV鍏ュ簱瀹屾垚浠ュ悗
- staProtocol.setWorkNo((short) 9998);
+ staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
@@ -179,7 +184,7 @@
map.put(115,4);
map.put(119,5);
map.put(123,6);
- map.put(300,7);
+ //map.put(301,7);
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -194,6 +199,9 @@
}
Short workNo = staProtocol.getWorkNo();
if (workNo == 0 && !staProtocol.isLoading()){
+ if (Cools.isEmpty(map.get(inSta.getStaNo()))){
+ continue;
+ }
list.add(map.get(inSta.getStaNo()));
}
}
--
Gitblit v1.9.1