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/WarehouseMapper.xml | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index ac9cbc6..dd45695 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -5,12 +5,37 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.Warehouse">
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
+ SELECT
+ w.*,
+ wgs.name,
+ doc.doc_name,
+ doc.doc_number,
+ dc.category
+ 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
+ LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ <where>
+ 1=1
+ <if test="warehouse.warehouseName != null">
+ and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%')
+ </if>
+ <if test="warehouse.id != null">
+ and w.id = #{warehouse.id}
+ </if>
+ </where>
+ </select>
+ <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse">
select * from warehouse
<where>
1=1
- <if test="warehouseName != null">
- and warehouse_name like concat('%',#{warehouseName},'%')
+ <if test="warehouse.warehouseName != null">
+ and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
+ </if>
+ <if test="warehouse.id != null">
+ and w.id = #{warehouse.id}
</if>
</where>
</select>
--
Gitblit v1.9.3