From 277b5047d00a3e9094bafd5ecb078976fbf6a92d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 18:59:04 +0800
Subject: [PATCH] 华玺砂浆转移-采购代码、发货和发货审核、报修和报修审核、采购模板,查询采购模板接口、财务管理的存货核算数据接口、财务管理的固定资产核算获取台账接口、采购审批,接口、客户分类字段、采购台账字段,实现采购异常记录的添加接口、黑名单,添加资质管理字段,可上传资质文件-至军泰伟业

---
 src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index f3f4d90..87dfa32 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -3,23 +3,37 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
-
-
-    <select id="listPage" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol">
-        select * from warehouse_goods_shelves_rowcol
+    <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
+--         SELECT
+--         wgsr.*,
+--         w.warehouse_name,
+--         wgs.name,
+--         dc.category
+--         FROM warehouse_goods_shelves_rowcol wgsr
+--         LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+--         LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+--         LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+--         LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+        SELECT
+        wgsr.*,
+        w.warehouse_name,
+        wgs.name
+        FROM warehouse_goods_shelves_rowcol wgsr
+        LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+        LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
         <where>
             1=1
-            <if test="storey != null">
-                and storey = #{storey}
+            <if test="warehouseGoodsShelvesRowcol.row != null">
+                and wgsr.row = #{warehouseGoodsShelvesRowcol.row}
             </if>
-            <if test="arrange != null">
-                and arrange = #{arrange}
+            <if test="warehouseGoodsShelvesRowcol.col != null">
+                and wgsr.col = #{warehouseGoodsShelvesRowcol.col}
             </if>
-            <if test="warehouseGoodsShelvesId != null">
-                and warehouse_goods_shelves_id = #{warehouseGoodsShelvesId}
+            <if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
+                and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
             </if>
-            <if test="warehouseId != null">
-                and warehouse_id = #{warehouseId}
+            <if test="warehouseGoodsShelvesRowcol.id != null">
+                and wgsr.id = #{warehouseGoodsShelvesRowcol.id}
             </if>
         </where>
     </select>

--
Gitblit v1.9.3