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-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml index fa971d4..68f0ef2 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper"> - -</mapper> \ No newline at end of file + <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard"> + select ems.*, e.equipment_code, e.equipment_name + from eam_maintenance_standard ems + inner join eam_equipment e + on ems.equipment_id = e.id + ${ew.customSqlSegment} + </select> +</mapper> -- Gitblit v1.9.3