From a23b44f21f596c5500bda617050aa72125e2e701 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 07 十月 2023 12:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 126 ++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index d922dfe..85395c6 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,23 +57,38 @@
@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("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
- }
+// if(!checkParam(param,agvWrkMast)){
+// return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
+// }
AgvTask agvTask = AgvTask.valueOf(param.getEventType());
Class<AgvTask> clz = AgvTask.class;
try {
- Method method = clz.getDeclaredMethod(param.getStatus(),AgvTaskCallBackParam.class);
- method.invoke(agvTask,param);
+ Method method = clz.getDeclaredMethod(param.getStatus(), AgvWrkMast.class, AgvTaskCallBackParam.class);
+ method.invoke(agvTask,agvWrkMast,param);
} catch (NoSuchMethodException e) {
return R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
} catch (InvocationTargetException e) {
@@ -103,20 +120,30 @@
*/
task{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
- agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),205);
+ agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
+
+ //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 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(),"D",agvWrkMast.getBarcode());
+ }
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
@@ -125,19 +152,19 @@
*/
task_allocated{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
@@ -146,25 +173,30 @@
*/
tote_load{
@Transactional
- public void success(AgvTaskCallBackParam param) {
- //淇敼婧愮珯鐐圭姸鎬佷负O.绌猴紝浠ュ強瑙ｇ粦鎵樼洏鏉＄爜
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getStationCode(),"O","");
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
+
+ //鍏ュ簱浠诲姟 || 鎷ｆ枡鍏ュ簱浠诲姟 ||鐩樼偣鍐嶅叆搴� ||绌烘澘鍏ュ簱
+ if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
+ //淇敼婧愮珯鐐圭姸鎬佷负O.绌猴紝浠ュ強瑙ｇ粦鎵樼洏鏉＄爜
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","");
+ }
+
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓�
- agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),203);
- //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬�
- //agvWaitPakinService.updateIoStatus(Integer.valueOf(param.getTaskCode()),"Y");
+ agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);
+
+
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
@@ -173,86 +205,86 @@
*/
tote_unload{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼宸ヤ綔妗ｇ姸鎬佷负204.鏀捐揣瀹屾垚
- agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),204);
+ agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
robot_reach{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
weight{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
},
rfid{
@Transactional
- public void success(AgvTaskCallBackParam param) {
+ public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void fail(AgvTaskCallBackParam param) {
+ public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void cancel(AgvTaskCallBackParam param) {
+ public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
- public void suspend(AgvTaskCallBackParam param) {
+ public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
}
};
//浠诲姟鐘舵�佷负鎴愬姛
- public abstract void success(AgvTaskCallBackParam param);
+ public abstract void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
//浠诲姟鐘舵�佷负澶辫触
- public abstract void fail(AgvTaskCallBackParam param);
+ public abstract void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
//浠诲姟鐘舵�佷负鍙栨秷
- public abstract void cancel(AgvTaskCallBackParam param);
+ public abstract void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
//浠诲姟鐘舵�佷负鎸傝捣
- public abstract void suspend(AgvTaskCallBackParam param);
+ public abstract void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
@Setter
AgvBasDevpService agvBasDevpService;
--
Gitblit v1.9.1