From e935889261ef38c8eaef31e54cbfc466d63d2ef4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 09:42:28 +0800
Subject: [PATCH] fanuc获取程序名、获取报警描述

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index b3a2f9a..ffcc41e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -22,13 +22,13 @@
             me.id equId
         FROM
             EquipmentLog a
-            INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
-            INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
-            INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
-            INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
-            AND a.CollectTime= b.maxgdtime
-            AND mew.workshop_id = #{ workshopId }
-            LEFT JOIN (
+                INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
+                INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
+                INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
+                INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
+                AND a.CollectTime= b.maxgdtime
+                AND mew.workshop_id = #{ workshopId }
+                LEFT JOIN (
                 SELECT
                     e1.equipment_code,
                     COUNT(1) COUNT

--
Gitblit v1.9.3