From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/production/ProductionBomStructureMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionBomStructureMapper.xml b/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
index 1f70c48..c116f6f 100644
--- a/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
@@ -17,4 +17,37 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listByBomId" resultType="com.ruoyi.production.bean.vo.ProductionBomStructureVo">
+ select pbs.*,
+ p.product_name as productName,
+ pm.product_id as productId,
+ pm.model,
+ top1.name as operationName
+ from production_bom_structure pbs
+ left join product_model pm on pbs.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_operation top1 on pbs.technology_operation_id = top1.id
+ where pbs.production_order_bom_id = #{bomId}
+ order by pbs.id
+ </select>
+
+ <select id="pickByBomId" resultType="com.ruoyi.production.bean.vo.ProductionBomStructureVo">
+ SELECT
+ pbs.*,
+ p.product_name AS productName,
+ pm.product_id AS productId,
+ pm.model,
+ top1.NAME AS operationName
+ FROM
+ production_bom_structure pbs
+ LEFT JOIN product_model pm ON pbs.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN technology_operation top1 ON pbs.technology_operation_id = top1.id
+ WHERE
+ pbs.parent_id IS NOT NULL
+ AND pbs.production_order_bom_id = #{bomId}
+ ORDER BY
+ pbs.id
+ </select>
+
</mapper>
--
Gitblit v1.9.3