From a8ae2cdf4f8bdeeae0bd3df40200aeecaf289f26 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Tue, 1 Jul 2025 16:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java | 13 +++++++++++++
 .../mapper/oa/SysOaWarehouseDetailMapper.xml        |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java
index 527b80c..1cb6aa1 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java
@@ -53,7 +53,20 @@ public class SysOaOutWarehouseListVo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 出入库时价格
+     */
+    private Double signPrice;
 
+    /**
+     * 出入库类别
+     */
+    private Long type;
+
+    /**
+     * 编号
+     */
+    private String masterNum;
 
 
 
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml
index 1da4529..0e7231f 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml
@@ -30,14 +30,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ware.warehouse_id as warehouseId,
         project.project_name as projectName,
         warehouse.name as warehouseName,
+        ware.sign_price as signPrice,
         ware.create_time,
         ware.create_by,
         ware.master_id,
-        ware.sign_price
+        ware.sign_price,
+        sowm.type,
+        master_num as masterNum
         from
         sys_oa_warehouse_detail ware
         left join sys_oa_project project on ware.project_id = project.project_id
         left join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id
+        left join sys_oa_warehouse_master sowm on sowm.master_id = ware.master_id
         <where>
              ware.del_flag='0'
             <if test="bo.projectName != null and bo.projectName != ''">
@@ -49,6 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.projectId != null and bo.projectId != ''">
                 and project.project_id = #{bo.projectId}
             </if>
+            <if test="bo.type != null and bo.type != ''">
+                and sowm.type = #{bo.type}
+            </if>
             <if test="bo.amount != null and bo.amount != ''">
                 and ware.amount = #{bo.amount}
             </if>