From cf65d0a608b21f07dc50a98b864dfe47def4f86b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 17:12:37 +0800
Subject: [PATCH] fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除
---
src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
index cb70944..d900460 100644
--- a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.consumables.pojo.ConsumablesOutRecord">
<id column="id" property="id" />
<result column="outbound_batches" property="outboundBatches" />
- <result column="Consumables_out_num" property="consumablesOutNum" />
+ <result column="stock_out_num" property="stockOutNum" />
<result column="record_id" property="recordId" />
<result column="record_type" property="recordType" />
<result column="product_model_id" property="productModelId" />
@@ -22,10 +22,12 @@
SELECT
sor.*,
p.product_name as productName,
+ sor.stock_out_num as qualitity,
pm.model,
pm.unit,
+ sor.weighbridge_doc_path,
u.nick_name as createBy
- FROM Consumables_out_record as sor
+ FROM consumables_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
@@ -52,7 +54,7 @@
pm.model,
pm.unit,
u.nick_name as createBy
- FROM Consumables_out_record as sor
+ FROM consumables_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
--
Gitblit v1.9.3