合并冲突解决

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -320,15 +320,13 @@
 			es.qr_code AS 'qrCode',
 			es.iot_code AS 'iotCode',
 			es.realtime_iot_index_value AS 'value',
-			sc.is_alarm AS isAlarm,
-            sc.emergency_level_color AS 'emergencyLevelColor'
+			ei.is_alarm AS isAlarm,
+            ei.emergency_level_color AS 'emergencyLevelColor'
 		FROM
 			wl_equipment_specific es,
-			wl_equipment_index ei,
-			wl_signal_classify sc
+			wl_equipment_index ei
 		WHERE
 			es.realtime_iot_index_id = ei.id
-            AND upper(ei.type_code) = upper(sc.type_code)
 		AND find_in_set(
 			es.id,
 			(
@@ -1512,10 +1510,10 @@
               wlec.name AS category_name
             FROM
               wl_equipment_specific AS spe
+            LEFT JOIN wl_stock_detail  AS det ON det.equipment_specific_id = spe.id
             LEFT JOIN wl_equipment AS wle ON spe.equipment_code = wle.code
             LEFT JOIN wl_equipment_category AS wlec ON wlec.id = wle.category_id
-            WHERE
-              spe.warehouse_structure_id =#{floorId}
+            WHERE  det.amount > 0 and spe.warehouse_structure_id = #{floorId}
      </select>
 
     <select id="getStationInfo" resultType="Map">