From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/BasShuttleMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
index 354bd82..bbd7552 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" />
@@ -25,6 +19,30 @@
<result column="lift_no" property="liftNo" />
<result column="pak_mk" property="pakMk" />
+ <result column="working_mode" property="workingMode" />
+ <result column="free" property="free" />
+ <result column="speed" property="speed" />
+ <result column="load_state" property="loadState" />
+ <result column="suspend_state" property="suspendState" />
+ <result column="lift_position" property="liftPosition" />
+ <result column="run_dir" property="runDir" />
+ <result column="run_dir2" property="runDir2" />
+ <result column="charg_state" property="chargState" />
+ <result column="power_percent" property="powerPercent" />
+ <result column="max_cell_voltage" property="maxCellVoltage" />
+ <result column="min_cell_voltage" property="minCellVoltage" />
+ <result column="voltage" property="voltage" />
+ <result column="charge_cycle_times" property="chargeCycleTimes" />
+ <result column="surplus_quantity" property="surplusQuantity" />
+ <result column="count_quantity" property="countQuantity" />
+ <result column="point" property="point" />
+ <result column="coord" property="coord" />
+ <result column="task" property="task" />
+ <result column="task_state" property="taskState" />
+ <result column="err_state" property="errState" />
+ <result column="status_sum" property="statusSum" />
+ <result column="err_time" property="errTime" />
+
</resultMap>
</mapper>
--
Gitblit v1.9.1