From 802796c22d7d21a6d572cd4c11844e6865521666 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 11:53:05 +0800
Subject: [PATCH] 新增库存，采购入库关联供应商，外协入库关联厂家
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index b90ba1b..f5e4300 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -30,7 +30,6 @@
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
left join product p on pm.product_id = p.id
- left join manufacturer m on su.manufacturer_id = m.id
</sql>
<sql id="WastePageColumns">
@@ -48,7 +47,6 @@
pm.model,
pm.unit,
p.product_name,
- m.name as manufacturer_name,
su.source
</sql>
@@ -164,7 +162,6 @@
pm.model,
pm.unit,
p.product_name,
- m.name as manufacturer_name,
su.source
<include refid="BaseWasteFromClause" />
<where>
@@ -191,8 +188,7 @@
su.*,
pm.model,
pm.unit,
- p.product_name,
- m.name as manufacturer_name
+ p.product_name
<include refid="BaseWasteFromClause" />
<where>
<if test="ew.type != null and ew.type != ''">
@@ -210,7 +206,6 @@
pm.model,
pm.unit,
p.product_name,
- m.name as manufacturer_name,
su.source,
su.type,
GROUP_CONCAT(DISTINCT su.batch_no ORDER BY su.batch_no SEPARATOR ',') as batch_no,
@@ -244,7 +239,6 @@
su.id,
p.product_name,
pm.model,
- m.name as manufacturer_name,
su.source,
pm.unit,
su.batch_no,
@@ -257,7 +251,6 @@
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
left join product p on pm.product_id = p.id
- left join manufacturer m on su.manufacturer_id = m.id
<where>
and su.type = 'waste'
<if test="ew.productModelId != null and ew.productModelId > 0">
--
Gitblit v1.9.3