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/BasLiftMapper.xml | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/BasLiftMapper.xml b/src/main/resources/mapper/BasLiftMapper.xml
index caae4e5..8c2d9e1 100644
--- a/src/main/resources/mapper/BasLiftMapper.xml
+++ b/src/main/resources/mapper/BasLiftMapper.xml
@@ -11,27 +11,23 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="pak_mk" property="pakMk" />
- <result column="lift_lock" property="liftLock" />
- <result column="position_arrival_feedback" property="positionArrivalFeedback" />
- <result column="ready" property="ready" />
- <result column="running" property="running" />
- <result column="mode" property="mode" />
- <result column="line_front_has_stock" property="lineFrontHasStock" />
- <result column="forward_rotation_feedback" property="forwardRotationFeedback" />
- <result column="reverse_feedback" property="reverseFeedback" />
- <result column="motor_overload" property="motorOverload" />
- <result column="line_end_has_stock" property="lineEndHasStock" />
- <result column="in_convey_line_card_tray_alarm" property="inConveyLineCardTrayAlarm" />
- <result column="out_convey_line_card_tray_alarm" property="outConveyLineCardTrayAlarm" />
- <result column="plat_position_deviation_alarm" property="platPositionDeviationAlarm" />
- <result column="plat_torque_deviation_alarm" property="platTorqueDeviationAlarm" />
- <result column="plat_shuttle_check" property="platShuttleCheck" />
- <result column="not_ready" property="notReady" />
- <result column="servo_error1" property="servoError1" />
- <result column="servo_error2" property="servoError2" />
- <result column="servo_error3" property="servoError3" />
- <result column="servo_error4" property="servoError4" />
- <result column="lift_actual_speed" property="liftActualSpeed" />
+
+ <result column="point" property="point" />
+ <result column="model" property="model" />
+ <result column="busy" property="busy" />
+ <result column="front_overrun" property="frontOverrun" />
+ <result column="back_overrun" property="backOverrun" />
+ <result column="left_overrun" property="leftOverrun" />
+ <result column="right_overrun" property="rightOverrun" />
+ <result column="over_height" property="overHeight" />
+ <result column="over_weight" property="overWeight" />
+ <result column="has_tray" property="hasTray" />
+ <result column="has_car" property="hasCar" />
+ <result column="device_error" property="deviceError" />
+ <result column="task_address" property="taskAddress" />
+ <result column="dist_address" property="distAddress" />
+ <result column="complete_task_no" property="completeTaskNo" />
+ <result column="lev" property="lev" />
</resultMap>
--
Gitblit v1.9.1