From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
index bc18949..316b06d 100644
--- a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
@@ -11,6 +11,7 @@
                     li.loc_id,
                     li.loc_code,
                     l.barcode,
+                    l.channel,
                     li.matnr_id,
                     li.matnr_code,
                     li.maktx,
@@ -22,6 +23,9 @@
                     man_loc_item li
                         INNER JOIN man_loc l ON l.id = li.loc_id
                     WHERE l.use_status = #{type}
+                    <if test="channel != null">
+                        AND l.channel = #{channel}
+                    </if>
                 GROUP BY
                     loc_id,
                     matnr_id,

--
Gitblit v1.9.1