From 74863c38a407b1e0f36250dfa0c63e5da7fe5f66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:06:51 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
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 12af9a8..02bf153 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -320,6 +320,7 @@
Date now = new Date();
try {
+ // 鏂欑鏈哄櫒浜轰换鍔℃墽琛岀姸鎬佸弽棣堝埌wcs锛岃繖閲屼笉璋冪敤
if (singleRobotCode.equals("14") || singleRobotCode.equals("15")) { // 涓ゅ彴CTU搴撴満鍣ㄤ汉缂栧彿
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("task_no", robotTaskCode));
if(wrkMast != null) {
@@ -486,13 +487,13 @@
mesService.outStation(apply);
// agv缁х画鎵ц
// 婧愮珯鐐规槸浜х嚎锛岀绔欏畬鎴愬悗缁檙cs鍙嶉缁х画鎵ц
- if(task.getSourceStaNo().contains("TOOL")) {
- TransInOutStationAllow inOutStationAllow = new TransInOutStationAllow();
- inOutStationAllow.setTaskno(robotTaskCode);
- inOutStationAllow.setStatus("Y");
- inOutStationAllow.setAgvCode(singleRobotCode);
- mesService.allowOutStation(inOutStationAllow);
- }
+// if(task.getSourceStaNo().contains("TOOL")) {
+// TransInOutStationAllow inOutStationAllow = new TransInOutStationAllow();
+// inOutStationAllow.setTaskno(robotTaskCode);
+// inOutStationAllow.setStatus("Y");
+// inOutStationAllow.setAgvCode(singleRobotCode);
+// mesService.allowOutStation(inOutStationAllow);
+// }
}
} break;
case ARRIVE_ON_STATION: {
@@ -525,6 +526,9 @@
}
if(transType.equals("01") && arrivalStation.getStationID().contains("XL") || arrivalStation.getStationID().contains("TOOL")) {
path = "ToolArrivalNotice";
+ }
+ if (arrivalStation.getStationID().startsWith("LG") || arrivalStation.getStationID().startsWith("LT")) {
+ path = "Aprs/" + path;
}
mesService.arriveOnStation(arrivalStation,path);
} break;
@@ -685,6 +689,20 @@
return result;
}
+ @Override
+ public RcsReturn siteBind(SiteBind siteBind) {
+ RcsReturn rcsReturn = new RcsReturn();
+ String url = HIK_URL + "api/robot/controller/site/bind";
+ String response = sendPost(url, JSONObject.toJSONString(siteBind));
+ if (!StringUtils.isEmpty(response) && response.contains("code")){
+ rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
+ } else {
+ rcsReturn.setCode("ERROR");
+ rcsReturn.setMessage("璋冪敤缁戝畾鎺ュ彛RCS鏃犺繑鍥�");
+ }
+ return rcsReturn;
+ }
+
// endregion
// region httpUtil
--
Gitblit v1.9.1