From c590106e1e4d08aa83b08d6e8d083aac38df6aec Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 10:21:32 +0800
Subject: [PATCH] #设备命令下发增加设备工作号
---
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/webapp/static/js/basLiftOpt/basLiftOpt.js | 5 +++--
src/main/java/com/zy/asrs/entity/BasShuttleOpt.java | 7 +++++++
src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js | 1 +
6 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 89fe287..13de4b5 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 e0dac67..1e7d2c3 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
@@ -106,6 +106,13 @@
@TableField("system_status")
private String systemStatus;
+ /**
+ * 璁惧宸ヤ綔鍙�
+ */
+ @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 systemStatus) {
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 a072104..daa8584 100644
--- a/src/main/resources/mapper/BasShuttleOptMapper.xml
+++ b/src/main/resources/mapper/BasShuttleOptMapper.xml
@@ -16,6 +16,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/webapp/static/js/basLiftOpt/basLiftOpt.js b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
index 6b277cc..977e32f 100644
--- a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
+++ b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
@@ -25,12 +25,13 @@
{field: 'id', align: 'center',title: '缂栧彿'}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+ ,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
+ ,{field: 'deviceWrk', align: 'center',title: '璁惧宸ヤ綔鍙�'}
,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'command', align: 'center',title: '鍛戒护'}
- ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
index 6fbeae0..aa8aead 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
@@ -28,6 +28,7 @@
,{field: 'distLocNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'command', align: 'center',title: '鍛戒护'}
,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
+ ,{field: 'deviceWrk', align: 'center',title: '璁惧宸ヤ綔鍙�'}
,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
--
Gitblit v1.9.1