From d05d46076c62c744cdbd84c84d6e19b42cda9259 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期三, 02 七月 2025 09:30:15 +0800
Subject: [PATCH] 入库管理，出库管理，库存管理后端接口修改
---
src/main/resources/mapper/inventory/StockOutMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/inventory/StockOutMapper.xml b/src/main/resources/mapper/inventory/StockOutMapper.xml
index a551498..024494e 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_id,
+ T1.product_recordid,
T1.inbound_time,
T1.inbound_batch,
T1.supplier_id,
@@ -16,22 +16,27 @@
T2.tax_inclusive_total_price,
T2.tax_rate,
T2.tax_exclusive_total_price,
- T1.inbound_person,
+ T1.user_id,
T1.tenant_id,
T2.product_category,
T2.specification_model,
T2.unit,
- T3.supplier_name
+ T3.supplier_name,
+ T4.nick_name
FROM
stock_out T1
INNER JOIN
product_record T2
ON
- T1.product_id = T2.product_id
+ T1.product_recordid = T2.id
INNER JOIN
supplier_manage T3
ON
T1.supplier_id = T3.id
+ INNER JOIN
+ sys_user T4
+ ON
+ T1.user_id = T4.user_id
<where>
<if test="stockOutdto.supplierName != null and stockOutdto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockOutdto.supplierName}, '%')
@@ -42,7 +47,7 @@
<select id="stockoutExportList" resultType="com.ruoyi.inventory.excel.StockOutExcelDto">
SELECT
T1.id,
- T1.product_id,
+ T1.productrecord_id,
T1.inbound_time,
T1.inbound_batch,
T1.supplier_id,
@@ -51,22 +56,27 @@
T2.tax_inclusive_total_price,
T2.tax_rate,
T2.tax_exclusive_total_price,
- T1.inbound_person,
+ T1.user_id,
T1.tenant_id,
T2.product_category,
T2.specification_model,
T2.unit,
- T3.supplier_name
+ T3.supplier_name,
+ T4.nick_name
FROM
stock_out T1
INNER JOIN
product_record T2
ON
- T1.product_id = T2.product_id
+ T1.productrecord_id = T2.id
INNER JOIN
supplier_manage T3
ON
T1.supplier_id = T3.id
+ INNER JOIN
+ sys_user T4
+ ON
+ T1.user_id = T4.user_id
<where>
<if test="stockOutdto.supplierName != null and stockOutdto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockOutdto.supplierName}, '%')
--
Gitblit v1.9.3