From e6ed9e8a9f24683e8ea4e9fc2c82b1d4e24bb00a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 十月 2023 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index d8e056b..35730ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -128,8 +128,7 @@
public int containerArrived(AgvWrkMast agvWrkMast) {
Map<String,String> containerArrivedParam = new HashMap<>();
- String slotCode = agvWrkMast.getSourceLocNo().substring(3, 6) + "-1";
- containerArrivedParam.put("slotCode",slotCode);
+ containerArrivedParam.put("slotCode",agvWrkMast.getSourceLocNo());
containerArrivedParam.put("containerCode",agvWrkMast.getBarcode());
return doHttpRequest(containerArrivedParam,"瀹瑰櫒杈惧埌閫氱煡",url, containerArrivedPath,null,"127.0.0.1");
@@ -163,7 +162,9 @@
agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
//AgvTaskkDescribeParam
- agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
+ if(agvWrkMast.getSourceLocNo().contains("C")){
+ agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
+ }
agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
return agvTaskParam;
--
Gitblit v1.9.1