From f38aee0763020103d18feb53f00e9df5c1bc4315 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 10:46:49 +0800
Subject: [PATCH] 保养后生成领用记录
---
src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
index cb70944..e13e705 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,14 +22,17 @@
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
<where>
+ 1=1
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
</if>
@@ -52,11 +55,12 @@
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
<where>
+ 1=1
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
</if>
--
Gitblit v1.9.3