From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +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 | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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..f9759e6 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()));
@@ -139,6 +134,8 @@
}
}
+ setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
+
return agvBasDevpDto;
}).collect(Collectors.toList());
@@ -153,4 +150,29 @@
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();
+ }
+
}
--
Gitblit v1.9.1