From a054ae4d0cb2c8749fd8d440556ad762e8ea02ec Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 09 五月 2024 11:06:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 11 ++++++----- src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 8 ++++++++ src/main/java/com/zy/asrs/controller/AgvMobileController.java | 3 +++ src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 2 +- src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 47bfee1..f507486 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -192,6 +192,9 @@ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode); + if (threeCode.substring(0,2).equals(30)) { + wrapper.isNull("specs").or().eq("specs",""); + } List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper); for (AgvLocDetl agvLocDetl : agvLocDetls) { diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java index 4eb2f8d..2eec845 100644 --- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java @@ -43,7 +43,7 @@ /* 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.搴撴牸绉昏浇)鐨勬暟鎹� */ - @Scheduled(cron = "0/10 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") public void excutePutwayWrk(){ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>() .eq("wrk_sts", 205) @@ -51,7 +51,8 @@ .or().eq("io_type",1) .or().eq("io_type",57) .or().eq("io_type",10) - .or().eq("io_type",11)); + .or().eq("io_type",11) + .or().eq("io_type",108)); if(!Cools.isEmpty(agvWrkMastList)){ agvWrkMastList.stream().forEach(agvWrkMast -> { agvWrkMastHandler.completedPutWayWrk(agvWrkMast); @@ -62,7 +63,7 @@ /* 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱) */ - @Scheduled(cron = "0/10 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") public void excuteCarryWrk(){ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>() .eq("wrk_sts", 206) @@ -78,7 +79,7 @@ /* 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱) */ - @Scheduled(cron = "0/10 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") public void excuteCarryWrk2(){ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>() .eq("wrk_sts", 208) @@ -96,7 +97,7 @@ putaway锛氫笂鏋� 瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹� */ - @Scheduled(cron = "0/10 * * * * ? ") + @Scheduled(cron = "0/2 * * * * ? ") public void startPutwayWrk(){ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50) ,new EntityWrapper<AgvWrkMast>() diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java index 34be800..b5ae4bb 100644 --- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java @@ -26,7 +26,7 @@ @Autowired private WorkMastHandler workMastHandler; - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") private void execute(){ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData(); if (wrkMasts.isEmpty()) { 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 f08cbde..7979ca5 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -93,6 +93,14 @@ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); } + //绫诲瀷涓鸿皟鎷ㄥ簱浣嶇Щ杞椂 + if(agvWrkMast.getIoType() == 108){ + //鏇存柊搴撳瓨鏄庣粏 + agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo()); + //淇敼婧愬簱浣嶇姸鎬佷负O + agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null); + } + //鍒犻櫎AGV宸ヤ綔妗� agvWrkMastService.deleteById(wrkNo); //鍒犻櫎AGV宸ヤ綔鏄庣粏妗� diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java index 47bd04c..beca64d 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java @@ -88,6 +88,7 @@ AgvWrkDetl wrkDetl = new AgvWrkDetl(); wrkDetl.setWrkNo(mast1.getWrkNo()); wrkDetl.sync(agvLocDetl); + wrkDetl.setSpecs("1-" + agvLocMast.getLocType3()); wrkDetl.setSuppCode(agvLocDetl.getSuppCode()); wrkDetl.setIoTime(now); wrkDetl.setAppeUser(9527L); -- Gitblit v1.9.1