From 43c3bd1484578178a3144cfa0602fec5844ef935 Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Sun, 24 Dec 2023 18:02:25 +0800
Subject: [PATCH] =?UTF-8?q?QRCODE=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LeaseOutDetailsController.java    | 11 +++++++++++
 .../sgzb/app/service/LeaseOutDetailsService.java |  2 ++
 .../service/impl/LeaseOutDetailsServiceImpl.java |  5 +++++
 .../bonus/sgzb/base/mapper/MaMachineMapper.java  |  2 ++
 .../resources/mapper/base/MaMachineMapper.xml    | 16 +++++++++++++++-
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
index 44bdd5f1..2c54b8dd 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
@@ -43,6 +43,17 @@ public class LeaseOutDetailsController extends BaseController {
         return getDataTable(leaseOutDetailsService.getMaMachineByCode(maCode));
     }
 
+    /**
+     * 根据QrCode编码查询设备信息
+     * @param qrCode 二维码编码
+     * @return 设备信息
+     */
+    @Log(title = "根据QRcode编码获取设备信息", businessType = BusinessType.QUERY)
+    @GetMapping("/getMaMachineByQrCode")
+    public TableDataInfo getMaMachineByQrCode(@RequestParam(value = "qrCode") String qrCode) {
+        return getDataTable(leaseOutDetailsService.getMaMachineByQrCode(qrCode));
+    }
+
     /**
      * 领料出库，对库存处理
      * @param record 出库内容
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
index faae8b64..fd0899c1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
@@ -20,4 +20,6 @@ public interface LeaseOutDetailsService {
     AjaxResult submitOut(LeaseOutDetails record);
 
     List<MaMachine> getMaMachineByCode(String maCode);
+
+    List<MaMachine> getMaMachineByQrCode(String qrCode);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index 2acfa378..bcaf3967 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -92,4 +92,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
     }
 
 
+    @Override
+    public List<MaMachine> getMaMachineByQrCode(String qrCode) {
+        return maMachineMapper.getMaMachineByQrCode(qrCode);
+    }
+
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
index 03f5ff79..98ec0f23 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
@@ -11,6 +11,8 @@ public interface MaMachineMapper {
 
     public List<MaMachine> getMaMachineByCode(String maCode);
 
+    public List<MaMachine> getMaMachineByQrCode(String qrCode);
+
     public List<MaMachine> getMaMachineList(MaMachine maMachine);
 
     public int maMachineAdd(MaMachine maMachine);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 445eeafc..5e45b4a8 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -90,7 +90,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt1 on mt.parent_id = mt1.type_id
         left join ma_type mt2 on mt1.parent_id = mt2.type_id
         left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
-        where m.ma_code = #{maCode} or m.qr_code = #{maCode}
+        where m.ma_code = #{maCode}
+    </select>
+
+    <select id="getMaMachineByQrCode" parameterType="java.lang.String" resultMap="MaMachineResult">
+        select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
+        m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
+        m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
+        mmb.label_code labelCode
+        from ma_machine m
+        left join (select id,p_id,name from sys_dic where p_id in (select id from sys_dic where value = 'ma_status')) dic on m.ma_status = dic.id
+        left join ma_type mt on m.type_id = mt.type_id
+        left join ma_type mt1 on mt.parent_id = mt1.type_id
+        left join ma_type mt2 on mt1.parent_id = mt2.type_id
+        left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
+        where m.qr_code = #{maCode}
     </select>