From 886ec394c38d842e1a2ef099782fbc93409e9d16 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 29 一月 2024 09:56:19 +0800 Subject: [PATCH] 修复卡顿Bug --- src/main/java/com/zy/asrs/controller/AgvOpenController.java | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java index 85395c6..bc92bad 100644 --- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java +++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java @@ -26,6 +26,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.EnumSet; +import java.util.Map; /** * 涓婃姤浜嬩欢绫诲瀷锛坋ventType锛夛細 @@ -77,12 +78,11 @@ } AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo)); if(Cools.isEmpty(agvWrkMast)){ - return R.error("浠诲姟缂栧彿閿欒"); + agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getContainerCode())); + if (Cools.isEmpty(agvWrkMast)){ + return R.error("浠诲姟缂栧彿閿欒"); + } } - -// if(!checkParam(param,agvWrkMast)){ -// return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�"); -// } AgvTask agvTask = AgvTask.valueOf(param.getEventType()); Class<AgvTask> clz = AgvTask.class; @@ -101,16 +101,12 @@ return R.ok(); } - private boolean checkParam(AgvTaskCallBackParam param, AgvWrkMast agvWrkMast){ - if(!agvWrkMast.getLocNo().equals(param.getLocationCode())){ - return false; - } - if(!agvWrkMast.getSourceLocNo().equals(param.getStationCode())){ - return false; - } - return true; - } + @PostMapping("/conveyor/loadContainerFinish ") + @AppAuth(memo = "鍙栧鍣ㄥ畬鎴愰�氱煡") + public R loadContainerFinish(@RequestBody Map<String,Object> params){ + return R.ok(); + } } enum AgvTask{ @@ -122,7 +118,10 @@ @Transactional public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) { //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 - agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205); + agvWrkMast.setWrkSts(205L); + agvWrkMast.setLocNo(param.getLocationCode()); + agvWrkMastService.updateById(agvWrkMast); + //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205); //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 107.鐩樼偣鍑哄簱 if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){ @@ -131,7 +130,7 @@ } //鍑哄簱浠诲姟 110.绌烘澘鍑哄簱 if(agvWrkMast.getIoType() == 110){ - agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode()); + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode()); } } @@ -207,7 +206,11 @@ @Transactional public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) { //淇敼宸ヤ綔妗g姸鎬佷负204.鏀捐揣瀹屾垚 - agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204); + agvWrkMast.setWrkSts(204L); + agvWrkMast.setLocNo(param.getLocationCode()); + agvWrkMastService.updateById(agvWrkMast); + //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204); + } public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) { -- Gitblit v1.9.1