From 71592bfa6e09c482ba6c12d4bacedd470fedbec8 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:48:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/AgvBasDevpDto.java | 5 +++--
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 4 ++--
src/main/resources/license.lic | 0
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 85f1aad..181abe4 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -148,7 +148,7 @@
//鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
//鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
- agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
+ agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList);
}
//濡傛灉娌℃湁鍏ュ簱閫氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍑哄簱浣滀笟
@@ -179,7 +179,7 @@
//鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
//鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
- agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
+ agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList);
}
}
diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
index 43c7a7b..627ec00 100644
--- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -16,11 +16,12 @@
private AgvWrkMast agvWrkMast;
- private AgvWaitPakin agvWaitPakin;
+ private List<AgvWaitPakin> agvWaitPakin;
private List<AgvWaitPakin> agvWaitPakins;
- private AgvWrkDetl agvWrkDetl;
+ private List<AgvWrkDetl> agvWrkDetl;
+
private List<AgvWrkDetl> agvWrkDetls;
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 989ce2a..95d83ed 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1