Merge remote-tracking branch 'origin/master'

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml

@@ -65,6 +65,8 @@
         r.scrap_cycle,
         r.goods_status,
         r.create_time,
+        r.quantity_level,
+        r.create_user,
             sh.sh_code,
             sl.location,
             -- 物料表：物料编号、名称、单位、型号、规格
@@ -75,10 +77,6 @@
             g.material_model ,
             -- 部门表：库存部门名称
             dept.dept_name,
-            -- 库存出入库明细表：入库时间、入库数量、生产标识（取最新入库记录）
-            in_rec.in_out_date,
-            in_rec.quantity AS inQuantity,
-            in_rec.quantity_level AS inQuantityLevel,
             u.name AS keeperName
         FROM ST_REALTIME_STOCK r
                  -- 左关联库房表：根据库房ID关联，过滤已删除
@@ -89,10 +87,8 @@
                  LEFT JOIN ST_GOODS g ON r.goods_id = g.id AND g.is_deleted = 0
             -- 左关联部门表：根据分厂ID/部门ID关联，过滤已删除
                  LEFT JOIN BLADE_DEPT dept ON r.dept_id = dept.id AND dept.is_deleted = 0
-            -- 左关联库存出入库明细表：取该库存最新的入库记录（入库类型）
-                 LEFT JOIN ST_STOCK_INOUT_RECORD in_rec ON in_rec.rls_id = r.id AND in_rec.is_deleted = 0
             -- 左关联用户表：取保管员姓名（假设库位表sl.keeper_id关联用户ID）
-                 LEFT JOIN BLADE_USER u ON in_rec.keeper = u.id AND u.is_deleted = 0
+                 LEFT JOIN BLADE_USER u ON r.create_user = u.id AND u.is_deleted = 0
         -- 主表过滤条件
         <where>
             r.is_deleted = 0