From 047d6181a5f51711521c5e38f081d6e8760e22d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 10:45:34 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
index 7d84ce8..575f680 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
@@ -35,7 +35,7 @@
      * 鍥涘悜绌挎杞﹀彿
      */
     @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
-    @TableId(value = "shuttle_no", type = IdType.AUTO)
+    @TableId(value = "shuttle_no", type = IdType.INPUT)
     private Integer shuttleNo;
 
     /**
@@ -54,7 +54,7 @@
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    private Integer wrkNo;
+    private Integer taskNo;
 
     /**
      * 鏆傚瓨搴撲綅
@@ -125,12 +125,19 @@
     @ApiModelProperty(value= "鎵�灞炴満鏋�")
     private Long hostId;
 
+    /**
+     * 璁惧鐘舵��
+     */
+    @ApiModelProperty(value= "璁惧鐘舵��")
+    private String protocol;
+
     public BasShuttle() {}
 
-    public BasShuttle(Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer runSpeed,Integer deleted,Long hostId) {
+    public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer taskNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer runSpeed, Integer deleted, Long hostId, String protocol) {
+        this.shuttleNo = shuttleNo;
         this.status = status;
         this.shuttleStatus = shuttleStatus;
-        this.wrkNo = wrkNo;
+        this.taskNo = taskNo;
         this.idleLoc = idleLoc;
         this.autoCharge = autoCharge;
         this.chargeLine = chargeLine;
@@ -142,9 +149,10 @@
         this.runSpeed = runSpeed;
         this.deleted = deleted;
         this.hostId = hostId;
+        this.protocol = protocol;
     }
 
-//    BasShuttle basShuttle = new BasShuttle(
+    //    BasShuttle basShuttle = new BasShuttle(
 //            null,    // 鐘舵��
 //            null,    // 褰撳墠灏忚溅鐘舵��
 //            null,    // 浠诲姟鍙�

--
Gitblit v1.9.1