From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
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