From b0468de8060cc0a08cfe9d7c8e56c988e9b03c2e Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Fri, 29 Aug 2025 18:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E6=A0=87=E7=AD=BE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ma/controller/MachineController.java      | 15 ++++++++
 .../material/ma/mapper/MachineMapper.java     |  2 +
 .../material/ma/service/IMachineService.java  |  2 +
 .../ma/service/impl/MachineServiceImpl.java   |  5 +++
 .../mapper/material/ma/MachineMapper.xml      | 38 +++++++++++++++++++
 5 files changed, 62 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
index 1670a709..7a9a5fc9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
@@ -195,6 +195,21 @@ public class MachineController extends BaseController {
             return error("系统错误, " + e.getMessage());
         }
     }
+    /**
+     * 电子标签编码查询接口
+     *
+     * @param machine
+     * @return
+     */
+    @ApiOperation(value = "电子标签编码查询接口")
+    @GetMapping("/getNewByMaCode")
+    public AjaxResult getNewByMaCode(Machine machine) {
+        try {
+            return success(machineService.getNewByMaCode(machine));
+        } catch (Exception e) {
+            return error("系统错误, " + e.getMessage());
+        }
+    }
 
     /**
      * 根据标签信息查询出库单
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
index 9a4079fb..c54c0acf 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java
@@ -225,4 +225,6 @@ public interface MachineMapper
     int editMachineStatus(Machine machine);
 
     int updateMaStatus(BoxBindWarehouseDto boxMa);
+
+    List<Machine> getNewByMaCode(Machine machine);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java
index 399f10de..331a5e2f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java
@@ -142,4 +142,6 @@ public interface IMachineService
     AjaxResult getHisByCodeNew(Machine machine);
 
     AjaxResult editMachineStatus(Machine machine);
+
+    List<Machine> getNewByMaCode(Machine machine);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
index cf6dcd9d..bd6e1964 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java
@@ -582,6 +582,11 @@ public class MachineServiceImpl implements IMachineService
         return error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
     }
 
+    @Override
+    public List<Machine> getNewByMaCode(Machine machine) {
+        return machineMapper.getNewByMaCode(machine);
+    }
+
     /**
      * 编码铭牌信息
      * @param machine
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 1f5c9b92..89db9f2e 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
@@ -994,4 +994,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateMaStatus">
         update ma_machine set ma_status = 1 where ma_id = #{maId}
     </update>
+
+    <select id="getNewByMaCode" resultMap="MachineResult">
+
+        SELECT
+            mi.id as maId,
+            mi.ma_name as materialName,
+            mi.ma_model as materialModel,
+            mi.ma_code as maCode,
+            LEFT(mi.this_check_time, 10) AS thisCheckTime,
+            LEFT(mi.next_check_time, 10) AS nextCheckTime,
+            mi.repair_man as repairMan,
+            mi.check_man as checkMan,
+            mi.phone,
+            mi.result,null AS reportCode,null AS reportUrl,
+            mi.type,
+            '1' as devType
+        FROM
+            ws_ma_info mi
+        WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1
+        UNION
+        SELECT
+            mm.ma_id AS id,
+            mt2.type_name as maName,
+            mt.type_name as maModel,
+            mm.ma_code as maCode,
+            LEFT(mm.this_check_time, 10) AS thisCheckTime,
+            LEFT(mm.next_check_time, 10) AS nextCheckTime,
+            mm.check_man as repairMan,
+            ifnull(mm.inspect_man,"高民")   as checkMan,
+            "0551-63703966" as phone,
+            "合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
+            is_jj as type,
+            mt.jiju_type as devType
+        FROM ma_machine mm
+            LEFT JOIN ma_type mt on mm.type_id = mt.type_id
+            LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0
+    </select>
 </mapper>