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/StockInMapper.xml |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/inventory/StockInMapper.xml b/src/main/resources/mapper/inventory/StockInMapper.xml
index fca267e..aa53b7d 100644
--- a/src/main/resources/mapper/inventory/StockInMapper.xml
+++ b/src/main/resources/mapper/inventory/StockInMapper.xml
@@ -39,7 +39,7 @@
     <select id="selectStockInWithProductInfo" resultType="com.ruoyi.inventory.dto.StockinDto">
         SELECT
         T1.id,
-        T1.product_id,
+        T1.product_recordid,
         T1.inbound_time,
         T1.inbound_batch,
         T1.supplier_id,
@@ -48,31 +48,29 @@
         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_in 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="stockinDto.supplierName != null and stockinDto.supplierName != ''">
                 AND T3.supplier_name LIKE CONCAT('%', #{stockinDto.supplierName}, '%')
-            </if>
-            <if test="stockinDto.startTime != null and stockinDto.startTime != ''">
-                AND T1.inbound_time &gt;= #{stockinDto.startTime}
-            </if>
-            <if test="stockinDto.endTime != null and stockinDto.endTime != ''">
-                AND T1.inbound_time &lt;= #{stockinDto.endTime}
             </if>
         </where>
         ORDER BY T1.inbound_time DESC
@@ -81,7 +79,7 @@
     <select id="stockinExportList" resultType="com.ruoyi.inventory.excel.StockInExcelDto">
         SELECT
         T1.id,
-        T1.product_id,
+        T1.product_recordid,
         T1.inbound_time,
         T1.inbound_batch,
         T1.supplier_id,
@@ -90,22 +88,26 @@
         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_in 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="stockinDto.supplierName != null and stockinDto.supplierName != ''">
                 AND T3.supplier_name LIKE CONCAT('%', #{stockinDto.supplierName}, '%')

--
Gitblit v1.9.3