From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 十月 2023 13:25:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 069fae5..b8cbc8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -109,16 +109,11 @@
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
BeanUtils.copyProperties(agvBasDevp, agvBasDevpDto);
-// if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
-// return agvBasDevpDto;
-// }
-
+ //濡傛灉宸ヤ綔浣嶇姸鎬佷负0.绌哄簱浣�,鍒欑洿鎺ヨ繑鍥�
if("O".equals(agvBasDevpDto.getLocSts())){
return agvBasDevpDto;
}
-// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
-// .eq("barcode", agvBasDevpDto.getBarcode()));
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevpDto.getDevNo())
.or().eq("source_loc_no",agvBasDevpDto.getDevNo()));
@@ -127,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);
@@ -137,6 +132,10 @@
agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
}
+ }
+
+ if(!Cools.isEmpty(agvWrkMast)){
+ setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
}
return agvBasDevpDto;
@@ -153,4 +152,33 @@
return result;
}
+ private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
+ //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳
+ if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){
+ agvBasDevpDto.setContainerMoveOutFlag(true);
+ }
+
+ //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳
+ if(agvWrkMast.getIoType() == 110 && "D".equals(agvBasDevpDto.getLocSts())){
+ agvBasDevpDto.setContainerMoveOutFlag(true);
+ }
+
+ //褰撳伐浣滄。绫诲瀷涓�103.鎷ｆ枡鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず鎷ｆ枡/鐩樼偣鍏ュ簱鎸夐挳
+ if(agvWrkMast.getIoType() == 103 && "F".equals(agvBasDevpDto.getLocSts())){
+ agvBasDevpDto.setPickInFlag(true);
+ }
+ //褰撳伐浣滄。绫诲瀷涓�107.鐩樼偣鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず鎷ｆ枡/鐩樼偣鍏ュ簱鎸夐挳
+ if(agvWrkMast.getIoType() == 107 && "F".equals(agvBasDevpDto.getLocSts())){
+ agvBasDevpDto.setPickInFlag(true);
+ }
+ }
+
+ public List<String> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableEmptyInSite();
+ }
+
+ public AgvBasDevp getByDevNo(String devNo) {
+ return this.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",devNo));
+ }
+
}
--
Gitblit v1.9.1