From b179a58f92528a0c0fe9bc8c657c19bc493812d8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 07 九月 2026 17:38:15 +0800
Subject: [PATCH] fix: 增强BOM导入功能，添加工序ID绑定及错误提示
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index df585f9..0924e23 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -12,6 +12,8 @@
<result column="create_user" property="createUser" />
<result column="create_time" property="createTime" />
<result column="update_user" property="updateUser" />
+ <result column="actual_start_time" property="actualStartTime" />
+ <result column="actual_end_time" property="actualEndTime" />
</resultMap>
<select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
@@ -81,8 +83,11 @@
<if test="c.productMainId != null">
and ppm.id = #{c.productMainId}
</if>
+ <if test="c.currentUserId != null">
+ and (pot.user_ids is null or pot.user_ids = '' or pot.user_ids = '[]' or json_contains(pot.user_ids, json_quote(cast(#{c.currentUserId} as char))))
+ </if>
</where>
- order by ppm.create_time desc
+ order by ppm.product_no desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
--
Gitblit v1.9.3