From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 295e480..aeada86 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -4,9 +4,9 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
SELECT
- p1.product_name AS product_type,
+ p1.product_name AS parentName,
sir.*,
- p.product_name AS product_name,
+ p.product_name AS productName,
pm.model,
pm.unit,
sir.weighbridge_doc_path,
@@ -17,6 +17,7 @@
INNER JOIN product p1 ON p1.id = p.parent_id AND p1.product_name != '鍗婃垚鍝�'
LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
<where>
+ 1=1
<if test="params.timeStr != null and params.timeStr != ''">
AND sir.create_time LIKE CONCAT('%', #{params.timeStr}, '%')
</if>
@@ -44,6 +45,7 @@
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sir.create_user = u.user_id
<where>
+ 1=1
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{params.timeStr},'%')
</if>
--
Gitblit v1.9.3