From 426ea165d182158227484dbea63e5c5cafaf6dac Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 17 三月 2026 17:18:19 +0800
Subject: [PATCH] 1.库存（展示非半成品） 2.入库记录展示非半成品以及过磅单 3.报工直接入库
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 0eee4f3..295e480 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -4,8 +4,38 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
SELECT
+ p1.product_name AS product_type,
sir.*,
- p.product_name as productName,
+ p.product_name AS product_name,
+ pm.model,
+ pm.unit,
+ sir.weighbridge_doc_path,
+ u.nick_name AS createBy
+ FROM stock_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
+ 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>
+ <if test="params.timeStr != null and params.timeStr != ''">
+ AND sir.create_time LIKE CONCAT('%', #{params.timeStr}, '%')
+ </if>
+ <if test="params.productName != null and params.productName != ''">
+ AND p.product_name LIKE CONCAT('%', #{params.productName}, '%')
+ </if>
+ <if test="params.type != null and params.type != ''">
+ AND sir.type = #{params.type}
+ </if>
+ <if test="params.recordType != null and params.recordType != ''">
+ AND sir.record_type = #{params.recordType}
+ </if>
+ </where>
+ ORDER BY sir.id DESC
+ </select>
+ <select id="listStockInRecordExportData" resultType="com.ruoyi.stock.execl.StockInRecordExportData">
+ SELECT
+ sir.*,
+ p.product_name as product_name,
pm.model,
pm.unit,
u.nick_name as createBy
--
Gitblit v1.9.3