From 26f59138aa3bfcac0fd049a0eb7a91f0f1c4bae8 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Sat, 30 Aug 2025 10:05:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A0=87=E7=AD=BE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=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 +++++ .../com/bonus/material/ma/domain/Machine.java | 2 + .../material/ma/mapper/MachineMapper.java | 2 + .../material/ma/service/IMachineService.java | 2 + .../ma/service/impl/MachineServiceImpl.java | 5 ++ .../mapper/material/ma/MachineMapper.xml | 57 +++++++++++++------ 6 files changed, 65 insertions(+), 18 deletions(-) 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 7a9a5fc9..4651164b 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 @@ -210,6 +210,21 @@ public class MachineController extends BaseController { return error("系统错误, " + e.getMessage()); } } + /** + * 电子标签编码查询接口 + * + * @param machine + * @return + */ + @ApiOperation(value = "电子标签编码查询接口") + @GetMapping("/findMaMsgById") + public AjaxResult findMaMsgById(Machine machine) { + try { + return success(machineService.findMaMsgById(machine)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } /** * 根据标签信息查询出库单 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java index 88ca091d..48ae5559 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java @@ -330,5 +330,7 @@ public class Machine extends BaseEntity { private String type; + private String repairMan; + private Integer manageType; } 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 c54c0acf..201576db 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 @@ -227,4 +227,6 @@ public interface MachineMapper int updateMaStatus(BoxBindWarehouseDto boxMa); List getNewByMaCode(Machine machine); + + List findMaMsgById(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 331a5e2f..ba541bfa 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 @@ -144,4 +144,6 @@ public interface IMachineService AjaxResult editMachineStatus(Machine machine); List getNewByMaCode(Machine machine); + + List findMaMsgById(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 bd6e1964..d974f1af 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 @@ -587,6 +587,11 @@ public class MachineServiceImpl implements IMachineService return machineMapper.getNewByMaCode(machine); } + @Override + public List findMaMsgById(Machine machine) { + return machineMapper.findMaMsgById(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 89db9f2e..128b7900 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 @@ -995,8 +995,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_machine set ma_status = 1 where ma_id = #{maId} - + SELECT + mm.ma_id AS maId, + mt2.type_name as materialName, + mt.type_name as materialModel, + 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 + UNION SELECT mi.id as maId, mi.ma_name as materialName, @@ -1013,23 +1031,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ws_ma_info mi WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1 - UNION + + LIMIT 60 + + +