From d4ef4c087fd27175ac75c8754854b519215b8a55 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 17 十二月 2024 10:56:52 +0800 Subject: [PATCH] 添加`@ManagerAuth`注解memo并优化sellout逻辑 --- src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) 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 6a10807..0dbdc53 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java @@ -198,7 +198,9 @@ throw new CoolException("褰撳墠搴撲綅姝e湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�"); } agvWrkMast.setWrkSts(201L); + agvWrkMast.setModiTime(new Date()); agvWrkMast.setLocNo(locMast.getLocNo()); + agvWrkMast.setLogErrMemo("start2-doAutoMove2"); agvWrkMastService.updateById(agvWrkMast); //鏇存柊鐩爣搴撲綅鐘舵�� updateAgvLocMast(locMast,"S"); @@ -218,6 +220,7 @@ agvWrkMast.setWrkSts(201L); agvWrkMast.setLocNo(locMast.getLocNo()); agvWrkMast.setLogErrMemo("start2-doAutoMove2"); + agvWrkMast.setModiTime(new Date()); agvWrkMastService.updateById(agvWrkMast); //鏇存柊鐩爣搴撲綅鐘舵�� updateAgvLocMast(locMast,"S"); @@ -240,8 +243,10 @@ } agvWrkMast.setWrkSts(201L); agvWrkMast.setLocNo(devpNo.getDevNo()); + agvWrkMast.setModiTime(new Date()); agvWrkMast.setLogErrMemo("start3-doHandMove2"); agvWrkMastService.updateById(agvWrkMast); + agvWrkMast.setModiTime(new Date()); updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode()); return SUCCESS; } @@ -310,6 +315,7 @@ updateAgvBasDevp(devpNo,"S",agvLocMast.getLocType2(),agvLocMast.getBarcode()); return SUCCESS; } + public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) { Date now = new Date(); AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo()); @@ -332,6 +338,7 @@ updateAgvBasDevp(agvBasDevp,"R"); return SUCCESS; } + public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) { Date now = new Date(); //鏌ヨ宸ヤ綔妗� @@ -556,6 +563,10 @@ if (LocMast.getLev1() != 2) { throw new CoolException("鐩爣妤煎眰涓嶆槸鍚稿浜屾ゼ"); } + List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1").eq("io_type", 12)); + if (agvWrkMasts.size() >= maxTansk) { + throw new CoolException("鑷姩绉诲簱浠诲姟宸插埌璁惧畾鏈�澶у�硷細" + maxTansk); + } //鐢熸垚宸ヤ綔妗� AgvWrkMast mast = new AgvWrkMast(); //宸ヤ綔鐘舵�� -- Gitblit v1.9.1