From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
index c926305..8aae6b7 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
@@ -14,14 +14,14 @@
<if test="param.locNo != null">
AND a.loc_no = #{param.locNo}
</if>
- <if test="param.row != null">
- AND a.row = #{param.row}
+ <if test="param.rowNo != null">
+ AND a.row_no = #{param.rowNo}
</if>
- <if test="param.bay != null">
- AND a.bay = #{param.bay}
+ <if test="param.bayNo != null">
+ AND a.bay_no = #{param.bayNo}
</if>
- <if test="param.lev != null">
- AND a.lev = #{param.lev}
+ <if test="param.levNo != null">
+ AND a.lev_no = #{param.levNo}
</if>
<if test="param.status != null">
AND a.status = #{param.status}
@@ -57,9 +57,9 @@
<select id="selectDigitalLocWhichNeedShow" resultType="java.util.Map">
SELECT
DISTINCT ml.loc_no AS locNo,
- ml.row,
- ml.bay,
- ml.lev,
+ ml.row_no AS rowNo,
+ ml.bay_no AS bayNo,
+ ml.lev_no AS levNo,
ml.loc_sts AS locSts
FROM man_loc ml
LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
--
Gitblit v1.9.1