From 7a2ce679e71f8ca970b48a65f08061412bbfe4a9 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 三月 2024 16:49:54 +0800
Subject: [PATCH] #导入库位覆盖
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 7 ++++++-
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 2 ++
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index 635c785..a4aea20 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -30,4 +30,6 @@
List<String> selectAllStationCode();
+ AgvBasDevp selectByDevNo(String devNo);
+
}
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 85f1aad..28ed908 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -272,4 +272,9 @@
return this.baseMapper.selectAllStationCode();
}
+ @Override
+ public AgvBasDevp selectByDevNo(String devNo) {
+ return this.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",devNo));
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index b56e7e9..2437e26 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -317,12 +317,17 @@
Date now = new Date();
// 婧愮珯鐐圭姸鎬佹娴�
+ //AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(station);
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
//鍒濆瀹氫箟涓虹┖鏉垮叆搴撶被鍨�
int ioType = 10;
- if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) || !agvBasDevp.getLocSts().equals("O")){
+// if(Cools.isEmpty(agvBasDevp.getBarcode())){
+// agvBasDevp.setBarcode(containerCode);
+// }
+
+ if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O")){
throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍏ュ簱");
}
--
Gitblit v1.9.1