From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 19bb11d..8440226 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -279,7 +279,8 @@
<select id="queryByProductionIdAndType" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
SELECT
- me.*
+ me.*,
+ mpe.production_id
FROM
mdc_production_equipment mpe,
mdc_equipment me
@@ -339,5 +340,22 @@
#{equipmentType}
</foreach>
</select>
+ <select id="queryByDepartIdsAndType" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
+ SELECT
+ e.*,
+ ep.production_id
+ FROM
+ mdc_equipment e
+ INNER JOIN mdc_production_equipment ep ON e.id = ep.equipment_id
+ WHERE
+ ep.production_id IN
+ <foreach collection='productionIds' item='id' open='(' separator=',' close=')'>
+ #{id}
+ </foreach>
+ AND e.id IN
+ <foreach collection='deviceIds' item='deviceId' open='(' separator=',' close=')'>
+ #{deviceId}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3