From b97ab3e077df3665663eb3a5b0c23d54c83a5548 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期五, 31 五月 2024 12:02:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 45c054d..1d108a5 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -117,9 +117,30 @@
task{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
+
+ //閽堝鍚屼竴涓枡绠卞叆搴撴椂浜х敓涓ゆ潯涓嶅悓鐩爣搴撲綅鐨勫叆搴撳伐浣滄。
+ if(agvWrkMast.getIoType() == 1 && !Cools.eq(agvWrkMast.getLocNo(),param.getLocationCode())){
+
+ //鏌ヨ鏂扮殑宸ヤ綔妗�
+ AgvWrkMast agvWrkMast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+ .eq("barcode", param.getContainerCode())
+ .eq("loc_no",param.getLocationCode()));
+
+ if(!Cools.isEmpty(agvWrkMast1)){
+ //鍙栨秷宸ヤ綔妗�
+ String locNo = agvWrkMast.getLocNo();
+ agvLocMastService.updateLocStsByLocNo(locNo,"O","");
+ agvWrkMastService.deleteByWrkNo(agvWrkMast.getWrkNo());
+ agvWrkDetlService.deleteByWrkNo(agvWrkMast.getWrkNo());
+
+ agvWrkMast = agvWrkMast1;
+ }
+ }
+
+
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
- if(param.getLocationCode().contains("@")){
+ if(param.getLocationCode().contains("@") && param.getLocationCode().contains("CS")){
agvWrkMast.setLocNo(param.getLocationCode());
}
//agvWrkMast.setLocNo(param.getLocationCode());
--
Gitblit v1.9.1