From d48f94b29304be6cabbeb6f9e9fe2b25bd7140f9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 09:14:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LiftThread.java | 3 ++-
src/main/java/com/zy/asrs/entity/BasLiftOpt.java | 10 +++++++++-
src/main/java/com/zy/core/thread/NyShuttleThread.java | 3 ++-
src/main/java/com/zy/asrs/entity/BasShuttleOpt.java | 10 +++++++++-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 1bd9be4..4c326c3 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
@@ -82,9 +82,16 @@
@ApiModelProperty(value= "鍛戒护鎶ユ枃(涓嬪彂)")
private String commandSend;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftOpt() {}
- public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String commandSend) {
+ public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String commandSend, String systemStatus) {
this.wrkNo = wrkNo;
this.liftNo = liftNo;
this.sendTime = sendTime;
@@ -93,6 +100,7 @@
this.memo = memo;
this.command = command;
this.commandSend = commandSend;
+ this.systemStatus = systemStatus;
}
// BasLiftOpt basLiftOpt = new BasLiftOpt(
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
index 798b0ca..f2eedf9 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
@@ -102,9 +102,16 @@
@ApiModelProperty(value= "鍛戒护鎶ユ枃(涓嬪彂)")
private String commandSend;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleOpt() {}
- public BasShuttleOpt(Integer wrkNo,Integer shuttleNo,Date sendTime,String mode,String sourceLocNo,String distLocNo,Date updateTime,Long updateBy,String memo,String command,String commandSend) {
+ public BasShuttleOpt(Integer wrkNo, Integer shuttleNo, Date sendTime, String mode, String sourceLocNo, String distLocNo, Date updateTime, Long updateBy, String memo, String command, String commandSend, String systemStatus) {
this.wrkNo = wrkNo;
this.shuttleNo = shuttleNo;
this.sendTime = sendTime;
@@ -116,6 +123,7 @@
this.memo = memo;
this.command = command;
this.commandSend = commandSend;
+ this.systemStatus = systemStatus;
}
// BasShuttleOpt basShuttleOpt = new BasShuttleOpt(
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 1fe3e6c..3e0bafd 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -327,7 +327,8 @@
null,
null,
JSON.toJSONString(command),
- JSON.toJSONString(commandArr)
+ JSON.toJSONString(commandArr),
+ JSON.toJSONString(liftProtocol)
);
liftOptService.insert(opt);
}
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 9648a90..788a303f 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -438,7 +438,8 @@
null,
null,
JSON.toJSONString(command),
- null
+ null,
+ JSON.toJSONString(shuttleProtocol)
);
shuttleOptService.insert(opt);
}
--
Gitblit v1.9.1