From 00e1f09d1ce3ed8ab3a9976d7b7af7ef558625af Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期日, 15 十月 2023 16:41:21 +0800 Subject: [PATCH] AGV工作档取消和完成 --- src/main/java/com/zy/asrs/controller/AgvOpenController.java | 54 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java index 9ad92d1..4c6a853 100644 --- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java +++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java @@ -1,5 +1,7 @@ package com.zy.asrs.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.AppAuth; import com.core.common.Cools; @@ -55,16 +57,27 @@ @AppAuth(memo = "ESS浠诲姟鍥炶皟") public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){ - //save api log (appkey 鍚庣画娣诲姞) - AppAuthUtil.auth("test-appkey",param, request); + apiLogService.save( + "ESS浠诲姟鍥炶皟", + "/tzskwms/agv/task/event/status", + null, + null, + JSON.toJSONString(JSONObject.toJSONString(param)), + null, + true + ); - AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode())); + + //save api log (appkey 鍚庣画娣诲姞) + + AppAuthUtil.auth("",param, request); + int wrkNo = Integer.parseInt(param.getTaskCode()); + if(wrkNo < 0){ + wrkNo = -wrkNo; + } + AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo)); if(Cools.isEmpty(agvWrkMast)){ return R.error("浠诲姟缂栧彿閿欒"); - } - - if(!checkParam(param,agvWrkMast)){ - return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�"); } AgvTask agvTask = AgvTask.valueOf(param.getEventType()); @@ -84,15 +97,6 @@ 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; - } } @@ -107,9 +111,13 @@ //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205); - //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 - if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103){ + //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 107.鐩樼偣鍑哄簱 + if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){ //淇敼鍑哄簱绔欑偣鐘舵�� + agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode()); + } + //鍑哄簱浠诲姟 110.绌烘澘鍑哄簱 + if(agvWrkMast.getIoType() == 110){ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode()); } } @@ -154,16 +162,10 @@ @Transactional public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) { - //鍏ュ簱浠诲姟 || 鎷f枡鍏ュ簱浠诲姟 - if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53){ + //鍏ュ簱浠诲姟 || 鎷f枡鍏ュ簱浠诲姟 ||鐩樼偣鍐嶅叆搴� ||绌烘澘鍏ュ簱 + if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){ //淇敼婧愮珯鐐圭姸鎬佷负O.绌猴紝浠ュ強瑙g粦鎵樼洏鏉$爜 agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O",""); - } - - //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 - if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103){ - //淇敼婧愬簱浣嶇姸鎬� - } //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓� -- Gitblit v1.9.1