From 97e045fb1271016af2777580b980f974977909f3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 五月 2024 09:58:20 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 901757f..1aca5fd 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -119,7 +119,7 @@
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
- mast.setWrkSts(201L);
+ mast.setWrkSts(21L);
//鍏ュ嚭搴撶被鍨�
mast.setIoType(111);
mast.setIoTime(now);
@@ -134,7 +134,7 @@
//瀹瑰櫒绫诲瀷
mast.setWhsType(30);
// 鐩爣妤煎眰
- mast.setPreHave(agvLocMast.getLocType3().toString());
+ mast.setPauseMk(agvLocMast.getLocType3().toString());
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -164,7 +164,7 @@
});
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(agvLocMast,"R");
- updateAgvBasDevp(devpNo,"S");
+ updateAgvBasDevp(devpNo,"S",null,agvLocMast.getBarcode());
return SUCCESS;
}
@@ -184,6 +184,13 @@
agvBasDevpService.updateById(agvBasDevp);
}
}
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevp.setBarcode(containerCode);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
+ }
public ReturnT<String> autoEmptyBack(AgvLocMast agvLocMast) {
Date now = new Date();
--
Gitblit v1.9.1