From 4b0095b48747072f6c1f427a52ec4b73dca0cc75 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 10:21:21 +0800
Subject: [PATCH] #设备命令下发增加设备工作号
---
src/main/java/com/zy/core/thread/LiftThread.java | 1 +
src/main/resources/mapper/BasShuttleOptMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/BasLiftOpt.java | 7 +++++++
src/main/resources/mapper/BasLiftOptMapper.xml | 1 +
src/main/java/com/zy/core/thread/NyShuttleThread.java | 1 +
src/main/java/com/zy/asrs/entity/BasShuttleOpt.java | 7 +++++++
6 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 8cda1cb..a77c5f2 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
@@ -83,6 +83,13 @@
@TableField("system_status")
private String systemStatus;
+ /**
+ * 璁惧宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "璁惧宸ヤ綔鍙�")
+ @TableField("device_wrk")
+ private String deviceWrk;
+
public BasLiftOpt() {}
public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
index b4d79de..1e476d8 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
@@ -123,6 +123,13 @@
@TableField("response")
private String response;
+ /**
+ * 璁惧宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "璁惧宸ヤ綔鍙�")
+ @TableField("device_wrk")
+ private String deviceWrk;
+
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, String systemStatus) {
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index ccc0864..4a7d3c0 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -381,6 +381,7 @@
JSON.toJSONString(command),
JSON.toJSONString(liftProtocol)
);
+ opt.setDeviceWrk(command.getTaskNo().toString());//璁惧宸ヤ綔鍙�
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 42d7115..1ba299f 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -336,6 +336,7 @@
);
opt.setSend(1);//宸蹭笅鍙�
opt.setResponse(JSON.toJSONString(result));//璇锋眰鍝嶅簲
+ opt.setDeviceWrk(command.getWrkNo().toString());//璁惧宸ヤ綔鍙�
shuttleOptService.insert(opt);
}
diff --git a/src/main/resources/mapper/BasLiftOptMapper.xml b/src/main/resources/mapper/BasLiftOptMapper.xml
index 0d9fa3f..64d0ae3 100644
--- a/src/main/resources/mapper/BasLiftOptMapper.xml
+++ b/src/main/resources/mapper/BasLiftOptMapper.xml
@@ -13,6 +13,7 @@
<result column="memo" property="memo" />
<result column="command" property="command" />
<result column="system_status" property="systemStatus" />
+ <result column="device_wrk" property="deviceWrk" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleOptMapper.xml b/src/main/resources/mapper/BasShuttleOptMapper.xml
index a9de684..99fefa1 100644
--- a/src/main/resources/mapper/BasShuttleOptMapper.xml
+++ b/src/main/resources/mapper/BasShuttleOptMapper.xml
@@ -18,6 +18,7 @@
<result column="system_status" property="systemStatus" />
<result column="send" property="send" />
<result column="response" property="response" />
+ <result column="device_wrk" property="deviceWrk" />
</resultMap>
--
Gitblit v1.9.1