From 2a542491b78e75cfa0a22b4c6eb6e6087bf2746e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 11 十一月 2023 13:28:10 +0800
Subject: [PATCH] bug修复

---
 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..fd4717c 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("CS") || agvWrkMast.getSourceLocNo().contains("SK")){
+                agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
+            }
             agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
             agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
             return agvTaskParam;

--
Gitblit v1.9.1