From c2b0be1a368a88e4adb6dda12d0aa5d3bb0df838 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 16:50:50 +0800
Subject: [PATCH] 搜索最近穿梭车,提升机完成方法

---
 src/main/resources/mapper/BasShuttleMapper.xml |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
index 724891e..181726d 100644
--- a/src/main/resources/mapper/BasShuttleMapper.xml
+++ b/src/main/resources/mapper/BasShuttleMapper.xml
@@ -8,12 +8,6 @@
         <result column="status" property="status" />
         <result column="shuttle_status" property="shuttleStatus" />
         <result column="wrk_no" property="wrkNo" />
-        <result column="row" property="row" />
-        <result column="bay" property="bay" />
-        <result column="lev" property="lev" />
-        <result column="his_row" property="hisRow" />
-        <result column="his_bay" property="hisBay" />
-        <result column="his_lev" property="hisLev" />
         <result column="idle_loc" property="idleLoc" />
         <result column="auto_charge" property="autoCharge" />
         <result column="charge_line" property="chargeLine" />
@@ -23,6 +17,24 @@
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
         <result column="lift_no" property="liftNo" />
+        <result column="pak_mk" property="pakMk" />
+        <result column="busy_status" property="busyStatus" />
+        <result column="current_code" property="currentCode" />
+        <result column="battery_power" property="batteryPower" />
+        <result column="battery_temp" property="batteryTemp" />
+        <result column="error_code" property="errorCode" />
+        <result column="plc_output_status_io" property="plcOutputStatusIo" />
+        <result column="status_error_code" property="statusErrorCode" />
+        <result column="plc_input_status" property="plcInputStatus" />
+        <result column="current_or_before_code" property="currentOrBeforeCode" />
+        <result column="code_offset_x" property="codeOffsetX" />
+        <result column="code_offset_y" property="codeOffsetY" />
+        <result column="current_voltage" property="currentVoltage" />
+        <result column="current_analog_value" property="currentAnalogValue" />
+        <result column="current_lift_servo_speed" property="currentLiftServoSpeed" />
+        <result column="current_move_servo_speed" property="currentMoveServoSpeed" />
+        <result column="current_lift_servo_load" property="currentLiftServoLoad" />
+        <result column="current_move_servo_load" property="currentMoveServoLoad" />
 
     </resultMap>
 

--
Gitblit v1.9.1