From 2d836c8b6a270b7007e1a2e1e9962cb9dcd8b6f6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 01 四月 2024 14:47:36 +0800
Subject: [PATCH] 入库接驳位空板自动出库 全班出库后自动空板入库

---
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index b1b53d9..be025c6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -222,17 +222,22 @@
     @Override
     public void combBinding(String barcode, String stationCode, Short containerType) {
 
+        AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", stationCode));
+
+        if(Cools.eq(agvBasDevp.getBarcode(),barcode)){
+            return;
+        }
+
         if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(barcode))){
             throw new CoolException("璇ユ枡绠辨湭缁勬墭锛屾棤娉曠粦瀹氱珯鐐�");
         }
 
-        AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", barcode));
+        AgvBasDevp agvBasDevp1 = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", barcode));
 
-        if(!Cools.isEmpty(agvBasDevp)){
+        if(!Cools.isEmpty(agvBasDevp1)){
             throw new CoolException(barcode + "宸茬粡缁戝畾鍦�"+ agvBasDevp.getDevNo() +"绔欑偣");
         }
 
-        agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",stationCode));
         if(agvBasDevp == null){
             throw new CoolException(stationCode + "绔欑偣淇℃伅閿欒");
         }

--
Gitblit v1.9.1