From f0f19fae3c310667b6732a3ac96df8e5d618fcff Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 15:15:37 +0800
Subject: [PATCH] 1.生产报工的成品未进入到入库记录中 2.仓储物流-入库来源保留合格自定义入库、生产报工-入库。出库来源只保留合格自定义出库

---
 src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml b/src/main/resources/mapper/consumables/ConsumablesOutRecordMapper.xml
index cb70944..71648cd 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" />
@@ -24,8 +24,9 @@
         p.product_name as productName,
         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 +53,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