From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/resources/mapper/stock/StockUninventoryMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 8b7c21a..9aed783 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -55,6 +55,7 @@
         (su.qualitity - COALESCE(su.locked_quantity, 0)) AS un_locked_quantity,
         pm.model,
         pm.unit,
+        pm.material_code as materialCode,
         p.product_name,
         p2.product_name AS parent_name
         FROM
@@ -73,6 +74,7 @@
         select su.*,
         pm.model,
         pm.unit,
+        pm.material_code as materialCode,
         p.product_name
         from stock_uninventory su
         left join product_model pm on su.product_model_id = pm.id

--
Gitblit v1.9.3