From fbc53e77f994f15c3ebcd4fa07dfd23671c0ce26 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期五, 04 七月 2025 16:04:51 +0800
Subject: [PATCH] 入库管理，出库管理，库存管理后端接口修改
---
src/main/resources/mapper/inventory/StockOutMapper.xml | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/inventory/StockOutMapper.xml b/src/main/resources/mapper/inventory/StockOutMapper.xml
index 024494e..00909df 100644
--- a/src/main/resources/mapper/inventory/StockOutMapper.xml
+++ b/src/main/resources/mapper/inventory/StockOutMapper.xml
@@ -7,7 +7,7 @@
<select id="selectStockOutBypage" resultType="com.ruoyi.inventory.dto.StockoutDto">
SELECT
T1.id,
- T1.product_recordid,
+ T1.productrecord_id,
T1.inbound_time,
T1.inbound_batch,
T1.supplier_id,
@@ -18,9 +18,9 @@
T2.tax_exclusive_total_price,
T1.user_id,
T1.tenant_id,
- T2.product_category,
- T2.specification_model,
- T2.unit,
+ T6.product_name,
+ T5.model,
+ T5.unit,
T3.supplier_name,
T4.nick_name
FROM
@@ -28,7 +28,7 @@
INNER JOIN
product_record T2
ON
- T1.product_recordid = T2.id
+ T1.productrecord_id = T2.id
INNER JOIN
supplier_manage T3
ON
@@ -37,7 +37,16 @@
sys_user T4
ON
T1.user_id = T4.user_id
+ INNER JOIN
+ product_model T5
+ ON
+ T2.product_model_id = T5.id
+ INNER JOIN
+ product T6
+ ON
+ T2.product_id = T6.id
<where>
+ T2.type = 1
<if test="stockOutdto.supplierName != null and stockOutdto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockOutdto.supplierName}, '%')
</if>
@@ -58,9 +67,9 @@
T2.tax_exclusive_total_price,
T1.user_id,
T1.tenant_id,
- T2.product_category,
- T2.specification_model,
- T2.unit,
+ T6.product_name,
+ T5.model,
+ T5.unit,
T3.supplier_name,
T4.nick_name
FROM
@@ -77,7 +86,16 @@
sys_user T4
ON
T1.user_id = T4.user_id
+ INNER JOIN
+ product_model T5
+ ON
+ T2.product_model_id = T5.id
+ INNER JOIN
+ product T6
+ ON
+ T2.product_id = T6.id
<where>
+ T2.type = 1
<if test="stockOutdto.supplierName != null and stockOutdto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockOutdto.supplierName}, '%')
</if>
--
Gitblit v1.9.3