From 2b3519929a06019633e04ee9abb0c6ef8bba358f Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 23 十月 2024 11:06:47 +0800 Subject: [PATCH] 测试环境暂时注释 --- src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) 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 ea153f8..9f9b11b 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -290,12 +290,12 @@ if(!isJSON(orderNo)){ //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); + orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); }else{ List<Map> maps = JSONArray.parseArray(orderNo, Map.class); maps.forEach(map -> { String o = map.get("orderNo").toString(); - orderService.checkComplete(o); + orderService.checkComplete(o,agvWrkMast.getLocNo()); }); } @@ -309,7 +309,8 @@ }catch (Exception e){ log.error(""+e.getMessage()); } - reportMes(agvWrkMast,agvWrkDetlListOld); + //TODO + //reportMes(agvWrkMast,agvWrkDetlListOld); return SUCCESS; } @@ -391,12 +392,12 @@ agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); if(!isJSON(orderNo)){ //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); + orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); }else{ List<Map> maps = JSONArray.parseArray(orderNo, Map.class); maps.forEach(map -> { String o = map.get("orderNo").toString(); - orderService.checkComplete(o); + orderService.checkComplete(o,agvWrkMast.getLocNo()); }); } @@ -448,12 +449,12 @@ agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); if(!isJSON(orderNo)){ //妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚 - orderService.checkComplete(orderNo); + orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); }else{ List<Map> maps = JSONArray.parseArray(orderNo, Map.class); maps.forEach(map -> { String o = map.get("orderNo").toString(); - orderService.checkComplete(o); + orderService.checkComplete(o,agvWrkMast.getLocNo()); }); } //涓婃姤mes -- Gitblit v1.9.1