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/StockManagementMapper.xml |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/inventory/StockManagementMapper.xml b/src/main/resources/mapper/inventory/StockManagementMapper.xml
index a1f6ef4..4bc349f 100644
--- a/src/main/resources/mapper/inventory/StockManagementMapper.xml
+++ b/src/main/resources/mapper/inventory/StockManagementMapper.xml
@@ -12,27 +12,33 @@
             T2.specification_model,
             T3.supplier_name,
             T1.id,
-            T1.product_id,
+            T1.product_recordid,
             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.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="stockManagementDto.supplierName != null and stockManagementDto.supplierName != ''">
                 AND T3.supplier_name LIKE CONCAT('%', #{stockManagementDto.supplierName}, '%')
@@ -47,27 +53,33 @@
         T2.specification_model,
         T3.supplier_name,
         T1.id,
-        T1.product_id,
+        T1.product_recordid,
         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.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="stockManagementDto.supplierName != null and stockManagementDto.supplierName != ''">
                 AND T3.supplier_name LIKE CONCAT('%', #{stockManagementDto.supplierName}, '%')

--
Gitblit v1.9.3