From b5d5cb947a194ceb34cd2797ab077f1484989305 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 11:39:31 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_New_pro_财务
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 428e8da..c71ce31 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -209,12 +209,6 @@
<if test="ew.topParentProductId != null and ew.topParentProductId > 0">
and combined.product_id in (select id from product_tree)
</if>
- <if test="ew.model != null and ew.model !=''">
- and combined.model like concat('%',#{ew.model},'%')
- </if>
- <if test="ew.batchNo != null and ew.batchNo !=''">
- and combined.batch_no like concat('%',#{ew.batchNo},'%')
- </if>
</where>
group by
product_model_id,
--
Gitblit v1.9.3