From 38a5f5195220132da2797116bbb3dbebb312c63b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 25 十月 2023 08:38:25 +0800
Subject: [PATCH] agv输送线入库

---
 src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java |    2 +-
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 1b46c02..9c4db97 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -100,7 +100,7 @@
                     .eq("station_code", stationCode)
                     .like("dev_no", "0" + i + "@");
 
-            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "307".equals(stationCode)){
+            if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "CS-307".equals(stationCode)){
                 wrapper.orderBy("dev_no",false);
             }
 
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 2cf9450..d8e056b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -128,7 +128,8 @@
     public int containerArrived(AgvWrkMast agvWrkMast) {
 
         Map<String,String> containerArrivedParam = new HashMap<>();
-        containerArrivedParam.put("slotCode",agvWrkMast.getSourceLocNo());
+        String slotCode = agvWrkMast.getSourceLocNo().substring(3, 6) + "-1";
+        containerArrivedParam.put("slotCode",slotCode);
         containerArrivedParam.put("containerCode",agvWrkMast.getBarcode());
 
         return doHttpRequest(containerArrivedParam,"瀹瑰櫒杈惧埌閫氱煡",url, containerArrivedPath,null,"127.0.0.1");

--
Gitblit v1.9.1