From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

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

diff --git a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
index 852c4b5..90ad348 100644
--- a/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/LocItemMapper.xml
@@ -2,55 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vincent.rsf.server.manager.mapper.LocItemMapper">
 
-    <select id="pageByStock" resultType="com.vincent.rsf.server.manager.entity.LocItem">
-        SELECT *
-        FROM (SELECT id,
-                     loc_id,
-                     loc_code,
-                     type,
-                     order_item_id,
-                     wk_type,
-                     matnr_id,
-                     maktx,
-                     matnr_code,
-                     unit,
-                     SUM(anfme)    anfme,
-                     SUM(qty)      qty,
-                     SUM(work_qty) work_qty,
-                     batch,
-                     spec,
-                     model,
-                     fields_index,
-                     update_by,
-                     create_by,
-                     update_time,
-                     create_time
-              FROM man_loc_item
-              GROUP BY matnr_id
-              UNION ALL
-              SELECT id,
-                     ''          AS loc_id,
-                     ''          AS loc_code,
-                     type,
-                     asn_item_id AS order_item_id,
-                     wk_type,
-                     matnr_id,
-                     maktx,
-                     matnr_code,
-                     unit,
-                     SUM(anfme)     anfme,
-                     SUM(qty)       qty,
-                     SUM(work_qty)  work_qty,
-                     batch,
-                     spec,
-                     model,
-                     fields_index,
-                     update_by,
-                     create_by,
-                     update_time,
-                     create_time
-              FROM man_warehouse_areas_item
-              GROUP BY matnr_id) t
-                ${ew.customSqlSegment}
-    </select>
 </mapper>

--
Gitblit v1.9.1