From 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 三月 2024 15:33:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index b7ef1bb..ca81a11 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -60,7 +60,7 @@
apiLogService.save(
"ESS浠诲姟鍥炶皟",
- "/tzskwms/agv/task/event/status",
+ "/phyzwms/agv/task/event/status",
null,
null,
JSON.toJSONString(JSONObject.toJSONString(param)),
@@ -119,7 +119,10 @@
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
- agvWrkMast.setLocNo(param.getLocationCode());
+ if(param.getLocationCode().contains("@")){
+ agvWrkMast.setLocNo(param.getLocationCode());
+ }
+ //agvWrkMast.setLocNo(param.getLocationCode());
agvWrkMastService.updateById(agvWrkMast);
//agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
--
Gitblit v1.9.1