From 10ade08bd530b7ee6b5dd83194c8f48d19b327ef Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:36:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 4c6a853..b9e7c04 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,7 +78,10 @@
}
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("浠诲姟缂栧彿閿欒");
+ }
}
AgvTask agvTask = AgvTask.valueOf(param.getEventType());
@@ -97,7 +101,12 @@
return R.ok();
}
+ @PostMapping("/conveyor/loadContainerFinish ")
+ @AppAuth(memo = "鍙栧鍣ㄥ畬鎴愰�氱煡")
+ public R loadContainerFinish(@RequestBody Map<String,Object> params){
+ return R.ok();
+ }
}
enum AgvTask{
@@ -109,7 +118,13 @@
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
- agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
+ agvWrkMast.setWrkSts(205L);
+ if(param.getLocationCode().contains("@") && param.getLocationCode().contains("CS")){
+ agvWrkMast.setLocNo(param.getLocationCode());
+ }
+ //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){
@@ -194,7 +209,11 @@
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
//淇敼宸ヤ綔妗ｇ姸鎬佷负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