From 3f2b0fdea3f5e8e3ba4cedf93571e6f2994fe12a Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 14 Aug 2025 13:43:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/ma/MachineMapper.xml      | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 74c29da0..80794510 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -823,8 +823,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (
             SELECT
                 wmi.id as maId,
-                mt2.type_name as maName,
-                mt.type_name as maModel,
+                wmi.ma_name as maName,
+                wmi.ma_model as maModel,
                 wmi.ma_code as maCode,
                 wmi.qr_code as qrCode,
                 wmi.model_id as typeId,
@@ -837,12 +837,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 wmi.this_check_time as thisCheckTime,
                 wmi.next_check_time as nextCheckTime,
                 '' as inOutNum,
-                mt.jiju_type as jiJuType,
-                mt.is_check as isCheck,
+                '1' as jiJuType,
+                '' as isCheck,
                 '1' as devType
             FROM ws_ma_info wmi
-                     LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
-                     LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
             WHERE
                 1=1
         <if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if>
@@ -854,8 +852,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getElectronicLabelByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
             wmi.id as maId,
-            mt2.type_name AS materialName,
-            mt.type_name AS materialModel,
+            wmi.ma_name AS materialName,
+            wmi.ma_model AS materialModel,
             wmi.ma_code as maCode,
             wmi.this_check_time as thisCheckTime,
             wmi.next_check_time as nextCheckTime,
@@ -868,8 +866,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             wmi.model_id as typeId
         FROM
             ws_ma_info wmi
-                LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         WHERE
         wmi.ma_code like concat('%', #{maCode}, '%')
         <if test="maId != null">
@@ -879,8 +875,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getHisByCodeNewByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
         wmi.id as maId,
-        mt2.type_name as maName,
-        mt.type_name as maModel,
+        wmi.ma_name as maName,
+        wmi.ma_model as maModel,
         wmi.ma_code as maCode,
         wmi.qr_code as qrCode,
         wmi.model_id as typeId,
@@ -893,12 +889,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wmi.this_check_time as thisCheckTime,
         wmi.next_check_time as nextCheckTime,
         '' as inOutNum,
-        mt.jiju_type as jiJuType,
-        mt.is_check as isCheck,
+        '1' as jiJuType,
         '1' as devType
         FROM ws_ma_info wmi
-        LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
-        LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
         WHERE
         1=1
         <if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if>