From f40eca81fed1efa0ec7ab8659929187733e83eb0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 16:26:07 +0800
Subject: [PATCH] # 跨层移库禁止 吸塑移出
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 134 +++++++++++++++++++++++++++++++++-----------
1 files changed, 101 insertions(+), 33 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 e8146cd..d9c18b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -37,38 +37,58 @@
public void initBasDevp(){
- //鍒濆鍖�1妤肩紦瀛樿揣鏋剁珯鐐� 2鎺�5鍒�3灞�
- this.insertBatch(getCacheBasDevpList(1,2,1,5,1,3,1));
- //鍒濆鍖�3妤肩紦瀛樿揣鏋剁珯鐐� 3鎺�5鍒�3灞�
- this.insertBatch(getCacheBasDevpList(5,9,1,5,1,3,3));
- //鍒濆鍖�3妤艰緭閫佺嚎宸ヤ綔绔欑偣 4涓珯鐐�
- this.insertBatch(getLineBasDevpList());
+// //鍒濆鍖�1妤肩紦瀛樿揣鏋剁珯鐐� 2鎺�5鍒�3灞�
+// this.insertBatch(getCacheBasDevpList(1,2,1,5,1,3,1));
+// //鍒濆鍖�3妤肩紦瀛樿揣鏋剁珯鐐� 3鎺�5鍒�3灞�
+// this.insertBatch(getCacheBasDevpList(5,9,1,5,1,3,3));
+// //鍒濆鍖�3妤艰緭閫佺嚎宸ヤ綔绔欑偣 4涓珯鐐�
+// this.insertBatch(getLineBasDevpList());
+ //寰呭寘瑁呮垚鍝佸瓨鍌ㄥ尯鍏ュ簱鎺ラ┏浣�
+ this.insertBatch(getConnectionBasDevpList("DI",12,2,true,(short)1));
+ //寰呭寘瑁呮垚鍝佸瓨鍌ㄥ尯鍑哄簱鎺ラ┏浣�
+ this.insertBatch(getConnectionBasDevpList("DO",8,2,false,(short)1));
+ //鍘熸潗鏂欏叆搴撴帴椹充綅
+ this.insertBatch(getConnectionBasDevpList("YI",14,2,true,(short)2));
+ //鍘熸潗鏂欏嚭搴撴帴椹充綅
+ this.insertBatch(getConnectionBasDevpList("YO",18,2,false,(short)2));
+ //绠卞３鍏ュ簱鎺ラ┏浣�
+ this.insertBatch(getConnectionBasDevpList("XI",5,2,true,(short)3));
+ //绠卞３鍑哄簱鎺ラ┏浣�
+ this.insertBatch(getConnectionBasDevpList("XO",12,2,false,(short)3));
}
- private List<AgvBasDevp> getLineBasDevpList(){
+// private List<AgvBasDevp> getLineBasDevpList(){
+// List<AgvBasDevp> agvBasDevpList = new ArrayList<>();
+// Date now = new Date();
+// for(int row=1; row<=4; row++){
+// agvBasDevpList.add(getAgvBasDevp(row,1,1,3,"N",now));
+// }
+// return agvBasDevpList;
+// }
+
+ private List<AgvBasDevp> getConnectionBasDevpList(String type, int num, int floor, boolean inEnable, Short locType){
List<AgvBasDevp> agvBasDevpList = new ArrayList<>();
Date now = new Date();
- for(int row=1; row<=4; row++){
- agvBasDevpList.add(getAgvBasDevp(row,1,1,3,"N",now));
+ for(int index=1; index<=num; index++){
+ agvBasDevpList.add(getAgvBasDevp(type,index,floor,inEnable,locType,now));
}
return agvBasDevpList;
}
- //鏍规嵁鎺掑垪灞傝幏鍙朅GV缂撳瓨璐ф灦绔欑偣鍒楄〃
- private List<AgvBasDevp> getCacheBasDevpList(int rowIndex, int rowMax, int bayIndex, int bayMax, int levIndex, int levMax, int floor){
- List<AgvBasDevp> agvBasDevpList = new ArrayList<>();
- Date now = new Date();
- for(int row=rowIndex; row<=rowMax; row++){
- for(int bay=bayIndex; bay<=bayMax; bay++){
- for(int lev=levIndex; lev<=levMax; lev++){
- agvBasDevpList.add(getAgvBasDevp(row,bay,lev,floor,"Y",now));
- }
- }
- }
-
- return agvBasDevpList;
- }
+// //鏍规嵁鎺掑垪灞傝幏鍙朅GV缂撳瓨璐ф灦绔欑偣鍒楄〃
+// private List<AgvBasDevp> getCacheBasDevpList(int rowIndex, int rowMax, int bayIndex, int bayMax, int levIndex, int levMax, int floor){
+// List<AgvBasDevp> agvBasDevpList = new ArrayList<>();
+// Date now = new Date();
+// for(int row=rowIndex; row<=rowMax; row++){
+// for(int bay=bayIndex; bay<=bayMax; bay++){
+// for(int lev=levIndex; lev<=levMax; lev++){
+// agvBasDevpList.add(getAgvBasDevp(row,bay,lev,floor,"Y",now));
+// }
+// }
+// }
+// return agvBasDevpList;
+// }
private AgvBasDevp getAgvBasDevp(int row, int bay, int lev, int floor, String cacheShelves, Date now){
AgvBasDevp agvBasDevp = new AgvBasDevp();
@@ -84,11 +104,27 @@
return agvBasDevp;
}
- public void updateLocStsAndBarcodeByDevNo(String devNo, String locSts, String barcode){
+ private AgvBasDevp getAgvBasDevp(String type, int index, int floor, boolean inEnable, Short locType, Date now){
+ AgvBasDevp agvBasDevp = new AgvBasDevp();
+ String no = index >= 10 ? index + "" : "0" + index;
+ String devNo = type + "_" + no + "F" + floor;
+ agvBasDevp.setDevNo(devNo);
+ agvBasDevp.setLocSts("O");
+ agvBasDevp.setInEnable(inEnable ? "Y" : "N");
+ agvBasDevp.setOutEnable(inEnable ? "N" : "Y");
+ agvBasDevp.setFloor(floor);
+ agvBasDevp.setLocType1(locType);
+ agvBasDevp.setModiTime(now);
+ agvBasDevp.setAppeTime(now);
+ return agvBasDevp;
+ }
+
+ public void updateLocStsAndBarcodeByDevNo(String devNo, String locSts, String barcode, Short containerType){
AgvBasDevp agvBasDevp = this.selectById(devNo);
agvBasDevp.setLocSts(locSts);
agvBasDevp.setBarcode(barcode);
+ agvBasDevp.setLocType2(containerType);
this.updateById(agvBasDevp);
}
@@ -120,6 +156,7 @@
return agvBasDevpDto;
}
+ //涓�涓伐浣滀綅鍙兘浼氬搴斿涓伐浣滄。锛屾樉绀哄伐浣滅姸鎬佹渶澶х殑宸ヤ綔妗�
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvBasDevpDto.getDevNo())
.or().eq("source_loc_no",agvBasDevpDto.getDevNo()));
@@ -142,34 +179,42 @@
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>()
.eq("supp_code", agvBasDevpDto.getBarcode()));
+ //濡傛灉鏈夊叆搴撻�氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍏ュ簱浣滀笟
if(!Cools.isEmpty(agvWaitPakinList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
}
+ //濡傛灉娌℃湁鍏ュ簱閫氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍑哄簱浣滀笟
if(Cools.isEmpty(agvWaitPakinList)){
- //AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo()));
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
//agv绔欑偣鍙鍖栫鐞嗕腑鐨勭粨浣欐暟閲忔樉绀�
for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){
agvWrkDetl.setVolume(0.0);
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
if(agvWrkMast.getIoType() == 103){
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
+ //瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
+ double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);
AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ //鐢ㄤ簬缁撲綑鏁伴噺鏄剧ず
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
}
if(agvWrkMast.getIoType() == 53){
AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
- //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
- agvWrkDetl.setVolume(agvLocDetl.getAnfme());
- //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme());
+ if(Cools.isEmpty(agvLocDetl)){
+ agvWrkDetl.setVolume(0.0);
+ }else {
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ }
}
}
if(!Cools.isEmpty(agvWrkDetlList)){
+ //鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ //鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
}
@@ -194,13 +239,26 @@
return result;
}
+ private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
+ double allAnfme = 0;
+ for (AgvWrkDetl wd1 : agvWrkDetlList){
+ if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
+ && Cools.eq(wd0.getBatch(),wd1.getBatch())
+ && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
+ && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
+ allAnfme += wd1.getAnfme();
+ }
+ }
+ return allAnfme;
+ }
+
private void setFlagForAgvBasDevpDto(AgvWrkMast agvWrkMast, AgvBasDevpDto agvBasDevpDto){
- //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳
+ //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず璐ф灦绂诲満鎸夐挳
if(agvWrkMast.getIoType() == 101 && "F".equals(agvBasDevpDto.getLocSts())){
agvBasDevpDto.setContainerMoveOutFlag(true);
}
- //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず瀹瑰櫒绂诲満鎸夐挳
+ //褰撳伐浣滄。绫诲瀷涓�101.鍑哄簱 骞朵笖 宸ヤ綔浣嶇姸鎬佷负F.鍦ㄥ簱鏃讹紝鏄剧ず璐ф灦绂诲満鎸夐挳
if(agvWrkMast.getIoType() == 110 && "D".equals(agvBasDevpDto.getLocSts())){
agvBasDevpDto.setContainerMoveOutFlag(true);
}
@@ -241,6 +299,11 @@
return this.baseMapper.selectCacheShelvesStationCodeByFloor(floor);
}
+ @Override
+ public List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor) {
+ return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType,floor);
+ }
+
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){
return this.baseMapper.selectDevNoAndNumBystationCode(stationCode);
}
@@ -250,4 +313,9 @@
return this.baseMapper.selectAllStationCode();
}
+ @Override
+ public AgvBasDevp selectByDevNo(String devNo) {
+ return this.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",devNo));
+ }
+
}
--
Gitblit v1.9.1