From f8bdc51fe4c57a250fb1240056d767883b7d6739 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 12 十二月 2023 16:49:17 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/common/model/AgvBasDevpDto.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
index da9de2d..5d9a130 100644
--- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -2,8 +2,11 @@
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
+import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.AgvWrkMast;
import lombok.Data;
+
+import java.util.List;
/**
* 鐢ㄤ簬灞曠ずAGV绔欑偣鍙鍖栫鐞嗛〉闈㈢殑鏁版嵁
@@ -13,6 +16,12 @@
private AgvWrkMast agvWrkMast;
- private AgvWaitPakin agvWaitPakin;
+ private List<AgvWaitPakin> agvWaitPakins;
+
+ private List<AgvWrkDetl> agvWrkDetls;
+
+ private boolean containerMoveOutFlag;
+
+ private boolean pickInFlag;
}
--
Gitblit v1.9.1