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/consumables/ConsumablesInRecordMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
index 695e611..7a40e51 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInRecordMapper.xml
@@ -5,15 +5,18 @@
<select id="listPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
SELECT
sir.*,
+ sir.stock_in_num as qualitity,
p.product_name as product_name,
pm.model,
pm.unit,
+ sir.weighbridge_doc_path,
u.nick_name as createBy
FROM consumables_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 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>
@@ -41,6 +44,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