From 61e45a2a7c94d845de5b9ace90bfee4bc9af4fd2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 四月 2026 11:32:21 +0800
Subject: [PATCH] 显示料号

---
 src/main/resources/mapper/stock/StockInRecordMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 11a01a0..a869ff2 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -8,14 +8,16 @@
         p.product_name AS product_name,
         pm.model,
         pm.unit,
+        pm.material_code AS materialCode,
         u.nick_name AS createBy
         FROM
         stock_in_record AS sir
         LEFT JOIN product_model AS pm ON sir.product_model_id = pm.id
         LEFT JOIN product AS p ON pm.product_id = p.id
-        LEFT JOIN product p2 ON p.parent_id = p2.id AND p2.product_name != '鍗婃垚鍝�'
+        LEFT JOIN product p2 ON p.parent_id = p2.id
         LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
         <where>
+            AND p2.product_name != '鍗婃垚鍝�'
             <if test="params.timeStr != null and params.timeStr != ''">
                 AND sir.create_time LIKE CONCAT('%', #{params.timeStr}, '%')
             </if>
@@ -36,6 +38,7 @@
         SELECT
         sir.*,
         p.product_name as product_name,
+        pm.material_code as materialCode,
         pm.model,
         pm.unit,
         u.nick_name as createBy
@@ -67,6 +70,7 @@
             p.product_name AS product_name,
             pm.model,
             pm.unit,
+            pm.material_code AS materialCode,
             u.nick_name AS createBy
         FROM
             stock_in_record AS sir

--
Gitblit v1.9.3