From 442fce2fa9c6d8d4fe7b1f2a22d66c03b07975e5 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 14 五月 2024 17:07:25 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 3 ++- src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 5 ++--- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 15 ++++++--------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index ea76c2e..5a91cb0 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -443,8 +443,8 @@ }); } //鏇存柊鐩爣搴撲綅鐘舵�� - updateAgvLocMast(agvLocMast,"R"); - updateAgvLocMast(locMast,"S"); + updateAgvLocMast(agvLocMast,"P"); + updateAgvLocMast(locMast,"Q"); return "ok"; } 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 51b9d57..a36527d 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -600,15 +600,14 @@ agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); // 绉诲簱鍙栨秷 - }else if(wrkMast.getIoType() == 108) { + }else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) { //婧愬簱浣� String locNo = wrkMast.getSourceLocNo(); - //鐩爣绔欑偣 - String devNo = wrkMast.getLocNo(); + + // 鐩爣搴撲綅 + String targetLocNo = wrkMast.getLocNo(); agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); - if(devNo.contains("@")){ - agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); - } + agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null); //鍑哄簱鍙栨秷 } else { //婧愬簱浣� @@ -616,9 +615,7 @@ //鐩爣绔欑偣 String devNo = wrkMast.getLocNo(); agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); - if(devNo.contains("@")){ - agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); - } + agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); } if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){ diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java index 08ec96a..a33a046 100644 --- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java @@ -41,7 +41,7 @@ /* - 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.搴撴牸绉昏浇)鐨勬暟鎹� + 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.鍗曞眰绉诲簱 || 12.璺ㄥ眰绉诲簱 || 108.鑷姩璋冩嫧 || 109.鎵嬪姩璋冩嫧)鐨勬暟鎹� */ @Scheduled(cron = "0/3 * * * * ? ") public void excutePutwayWrk(){ @@ -52,6 +52,7 @@ .or().eq("io_type",57) .or().eq("io_type",10) .or().eq("io_type",11) + .or().eq("io_type",12) .or().eq("io_type",108) .or().eq("io_type",109)); if(!Cools.isEmpty(agvWrkMastList)){ diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java index 61c5ba2..5c2a65e 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -91,19 +91,18 @@ agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode)); } //绫诲瀷涓哄簱浣嶇Щ杞椂 - if(agvWrkMast.getIoType() == 11){ + if(agvWrkMast.getIoType() == 11 || agvWrkMast.getIoType() == 12){ //鏇存柊搴撳瓨鏄庣粏 agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); //淇敼婧愬簱浣嶇姸鎬佷负O agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); } - //绫诲瀷涓鸿皟鎷ㄥ簱浣嶇Щ杞椂 + //绫诲瀷涓哄簱浣嶇Щ杞椂 if(agvWrkMast.getIoType() == 108){ //鏇存柊搴撳瓨鏄庣粏 agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); //淇敼婧愬簱浣嶇姸鎬佷负O - agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0); } -- Gitblit v1.9.1