From 4dfc306f910a8b1ae1a2869bc8ffd38b2faf8f2e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 09:02:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 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 18346cb..18b8ad1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -72,7 +72,7 @@
//save api log (appkey 鍚庣画娣诲姞)
AppAuthUtil.auth("",param, request);
- int wrkNo = Integer.parseInt(param.getReqCode());
+ int wrkNo = Integer.parseInt(param.getTaskCode());
if(wrkNo < 0){
wrkNo = -wrkNo;
}
@@ -82,6 +82,10 @@
if (Cools.isEmpty(agvWrkMast)){
return R.error("浠诲姟缂栧彿閿欒");
}
+ }
+
+ if(agvWrkMast.getWrkSts() >= 205){
+ return R.error("褰撳墠浠诲姟宸插畬鎴�");
}
AgvTask agvTask = AgvTask.valueOf(param.getMethod());
@@ -102,7 +106,7 @@
}
@PostMapping("/conveyor/loadContainerFinish ")
- @AppAuth(memo = "鍙栧鍣ㄥ畬鎴愰�氱煡")
+ @AppAuth(memo = "鍙栬揣鏋跺畬鎴愰�氱煡")
public R loadContainerFinish(@RequestBody Map<String,Object> params){
return R.ok();
@@ -112,17 +116,13 @@
enum AgvTask{
/**
- * 涓婃姤浠诲姟鐘舵��
+ * 涓婃姤浠诲姟瀹屾垚
*/
end{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
-
- //agvWrkMast.setLocNo(param.getLocationCode());
- agvWrkMastService.updateById(agvWrkMast);
- //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
//鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷ｆ枡鍑哄簱 || 107.鐩樼偣鍑哄簱
if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){
@@ -132,21 +132,24 @@
//鍑哄簱浠诲姟 110.绌烘澘鍑哄簱
if(agvWrkMast.getIoType() == 110){
agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+ agvWrkMast.setWrkSts(206L);
}
+ agvWrkMastService.updateById(agvWrkMast);
}
},
/**
- * 涓婃姤浠诲姟鍒嗛厤缁欐満鍣ㄤ汉
+ * 浠诲姟寮�濮�
*/
start{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-
+ //淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负203.浠诲姟寮�濮�
+ agvWrkMast.setWrkSts(203L);
+ agvWrkMastService.updateById(agvWrkMast);
}
-
},
/**
- * 涓婃姤鍙栫鐘舵��
+ * 璧板嚭鍌ㄤ綅鐘舵��
*/
outbin{
@Transactional
@@ -159,7 +162,7 @@
}
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓�
- agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);
+ agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
}
@@ -170,11 +173,7 @@
cancel{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
- //淇敼宸ヤ綔妗ｇ姸鎬佷负204.鏀捐揣瀹屾垚
- agvWrkMast.setWrkSts(204L);
- //agvWrkMast.setLocNo(param.getLocationCode());
- agvWrkMastService.updateById(agvWrkMast);
- //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
+
}
--
Gitblit v1.9.1