From 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 10:36:28 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
index 60b8eaf..19ff4f9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
@@ -181,6 +181,9 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    public Action() {
+    }
+
     public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime) {
         this.uuid = uuid;
         this.busId = busId;
@@ -201,7 +204,7 @@
         BusService service = SpringUtils.getBean(BusService.class);
         Bus bus = service.getById(this.busId);
         if (!Cools.isEmpty(bus)){
-            return String.valueOf(bus.getUuid());
+            return String.valueOf(bus.getBusNo());
         }
         return null;
     }

--
Gitblit v1.9.1