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/StockManagementMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/inventory/StockManagementMapper.xml b/src/main/resources/mapper/inventory/StockManagementMapper.xml
index a1f6ef4..6387ddc 100644
--- a/src/main/resources/mapper/inventory/StockManagementMapper.xml
+++ b/src/main/resources/mapper/inventory/StockManagementMapper.xml
@@ -7,32 +7,46 @@
<!-- 鏍规嵁渚涘簲鍟嗘ā绯婃悳绱�-->
<select id="selectStockManagementBypage" resultType="com.ruoyi.inventory.dto.StockManagementDto">
SELECT
- T2.unit,
- T2.product_category,
- T2.specification_model,
+ T5.unit,
+ T5.model,
+ T6.product_name,
T3.supplier_name,
T1.id,
- T1.product_id,
+ T1.productrecord_id,
T1.stock_quantity,
T2.tax_inclusive_unit_price,
T2.tax_inclusive_total_price,
T2.tax_rate,
T2.tax_exclusive_total_price,
- T1.inbound_person,
+ T1.user_id,
T1.supplier_id,
T1.tenant_id,
T1.bound_time,
- T1.inbound_time
+ T1.inbound_time,
+ T4.nick_name,
+ T1.inbound_batch
FROM
stock_management 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
+ INNER JOIN
+ product_model T5
+ ON
+ T2.product_model_id = T5.id
+ INNER JOIN
+ product T6
+ ON
+ T2.product_id = T6.id
<where>
<if test="stockManagementDto.supplierName != null and stockManagementDto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockManagementDto.supplierName}, '%')
@@ -42,32 +56,46 @@
<select id="stockManageExportList" resultType="com.ruoyi.inventory.excel.StockManagementExcelDto">
SELECT
- T2.unit,
- T2.product_category,
- T2.specification_model,
+ T5.unit,
+ T5.model,
+ T6.product_name,
T3.supplier_name,
T1.id,
- T1.product_id,
+ T1.productrecord_id,
T1.stock_quantity,
T2.tax_inclusive_unit_price,
T2.tax_inclusive_total_price,
T2.tax_rate,
T2.tax_exclusive_total_price,
- T1.inbound_person,
+ T1.user_id,
T1.supplier_id,
T1.tenant_id,
T1.bound_time,
- T1.inbound_time
+ T1.inbound_time,
+ T4.nick_name,
+ T1.inbound_batch
FROM
stock_management 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
+ INNER JOIN
+ product_model T5
+ ON
+ T2.product_model_id = T5.id
+ INNER JOIN
+ product T6
+ ON
+ T2.product_id = T6.id
<where>
<if test="stockManagementDto.supplierName != null and stockManagementDto.supplierName != ''">
AND T3.supplier_name LIKE CONCAT('%', #{stockManagementDto.supplierName}, '%')
@@ -76,4 +104,5 @@
</select>
+
</mapper>
--
Gitblit v1.9.3