From f1b97dcec8e07a5c72d240114b3908b8df5b1e44 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 13 十月 2023 10:25:12 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 10 ++++++++--
1 files changed, 8 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 f9759e6..b8cbc8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -122,7 +122,7 @@
if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
- .eq("zpallet", agvBasDevpDto.getBarcode()));
+ .eq("supp_code", agvBasDevpDto.getBarcode()));
agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
@@ -134,7 +134,9 @@
}
}
- setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
+ if(!Cools.isEmpty(agvWrkMast)){
+ setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
+ }
return agvBasDevpDto;
@@ -175,4 +177,8 @@
return this.baseMapper.getAvailableEmptyInSite();
}
+ public AgvBasDevp getByDevNo(String devNo) {
+ return this.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",devNo));
+ }
+
}
--
Gitblit v1.9.1