From 42e68faca0756d44b7c880c9876810ee47d6e92b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 17 二月 2025 17:57:25 +0800
Subject: [PATCH] 1.DNC模块，设备结构树权限分配优化与修改bug 2.MDC模块，设备编辑车间同步平移设备send目录 3.优化原有指派设备代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
index bb5aef0..c44d000 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
@@ -28,4 +28,38 @@
on p.PROCESS_ID = s.PROCESS_ID
where p.delete_flag = 0
</select>
+ <select id="findByPartsAndComponents" resultType="org.jeecg.modules.dnc.entity.ProcessStream">
+ SELECT
+ *
+ FROM
+ nc_process_stream ps
+ WHERE
+ ps.PROCESS_ID IN (
+ SELECT
+ pss.PROCESS_ID
+ FROM
+ nc_process_stream pss
+ WHERE
+ 1=1
+ <if test="productId != null and productId != ''">
+ AND pss.PRODUCT_ID = #{productId}
+ </if>
+ <if test="componentIds != null and componentIds.size() > 0">
+ AND pss.COMPONENT_ID IN
+ <foreach collection = "componentIds" item = "componentId" index = "index" open = "(" close= ")" separator = ",">
+ #{ componentId }
+ </foreach>
+ </if>
+ AND (
+ pss.PARTS_ID IS NULL
+ <if test="partsIds != null and partsIds.size() > 0">
+ OR pss.PARTS_ID IN
+ <foreach collection = "partsIds" item = "partsId" index = "index" open = "(" close = ")" separator = ",">
+ #{ partsId }
+ </foreach>
+ </if>
+ )
+ );
+
+ </select>
</mapper>
--
Gitblit v1.9.3