From bfaade97ef4858616d30ebafc51a1c2a7b1bf84a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 15 一月 2026 09:45:28 +0800
Subject: [PATCH] 运行没问题初版
---
src/main/java/com/zy/asrs/entity/TransParent.java | 1 +
src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java | 1 +
src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TransParent.java b/src/main/java/com/zy/asrs/entity/TransParent.java
index 441f856..ddbbc4a 100644
--- a/src/main/java/com/zy/asrs/entity/TransParent.java
+++ b/src/main/java/com/zy/asrs/entity/TransParent.java
@@ -35,5 +35,6 @@
//璇锋眰绫诲瀷
private String method;
+ private String startStation;
}
diff --git a/src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java b/src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java
index cdeb12f..609a395 100644
--- a/src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java
+++ b/src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java
@@ -10,6 +10,7 @@
APPLY_IN_OFF_STATION("applyInOffStation", "鍙栬揣绂荤珯璇锋眰"),
APPLY_OFF_STATION("applyOutOffStation", "鏀捐揣绂荤珯璇锋眰"),
ARRIVE_ON_STATION("arriveOnStation", "鍒扮珯瀹屾垚"),
+ ARRIVE_PUT_STATION("arrivePutStation", "鏀捐揣鍒扮珯瀹屾垚"),
ARRIVE_OFF_STATION("arriveOffStation", "绂荤珯瀹屾垚"),
diff --git a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
index 8d9f914..2cb7158 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -134,6 +134,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -223,6 +224,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -298,6 +300,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -363,6 +366,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -378,10 +382,6 @@
//鍙栬揣绂诲紑绔欑偣
int i = AGVDepartureCompleted(transParent);
if (i == 1) {
- // 鏇存柊浠诲姟鐘舵�佺瓑鍐呴儴閫昏緫
- task.setWrkSts(304L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
- task.setModiTime(new Date());
- agvTaskService.updateById(task);
rcsReturn.setCode("SUCCESS");
rcsReturn.setMessage("");
JSONObject data = new JSONObject();
@@ -433,6 +433,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -498,6 +499,7 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
@@ -543,6 +545,52 @@
transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
+ transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
+ //08-1鏄┖鎵樼洏杞簭浠诲姟
+ //08-2鏄墿鏂欒浆搴忎换鍔�
+ if (task.getTaskType().equals("ZX-AGV-08-1")) {
+ transParent.setTransType("08-1");
+ } else if (task.getTaskType().equals("ZX-AGV-08-2")) {
+ transParent.setTransType("08-2");
+ } else if (task.getTaskType().equals("PP-AGV")) {
+ transParent.setTransType("10");
+ } else if (task.getTaskType().equals("ZP-AGV")) {
+ transParent.setTransType("11");
+ }
+ int i = AGVArrivalCompletedFit(transParent);
+ if (i == 1) {
+ rcsReturn.setCode("SUCCESS");
+ rcsReturn.setMessage("");
+ JSONObject data = new JSONObject();
+ data.put("robotTaskCode", robotTaskCode);
+ rcsReturn.setData(data);
+ } else {
+ // 杩斿洖RCS
+ rcsReturn.setCode("Err_Internal");
+ rcsReturn.setMessage("");
+ JSONObject data = new JSONObject();
+ data.put("robotTaskCode", robotTaskCode);
+ rcsReturn.setData(data);
+ }
+ }
+ break;
+ }
+ //鍒扮珯瀹屾垚
+ case ARRIVE_PUT_STATION: {
+ if (task.getStaNo().equals("401") || task.getStaNo().equals("402") || task.getStaNo().equals("307")) {
+ // 杩斿洖RCS
+ rcsReturn.setCode("SUCCESS");
+ rcsReturn.setMessage("");
+ JSONObject data = new JSONObject();
+ data.put("robotTaskCode", robotTaskCode);
+ rcsReturn.setData(data);
+ } else {
+ TransParent transParent = new TransParent();
+ transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
+ transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
+ transParent.setStationId(task.getStaNo());
+ transParent.setStartStation(task.getSourceStaNo());
transParent.setAgvCode("2");//杩炴帴鍣ㄥ簱
//08-1鏄┖鎵樼洏杞簭浠诲姟
//08-2鏄墿鏂欒浆搴忎换鍔�
--
Gitblit v1.9.1