From 05e3e10f179d79ded031075b6ff9cdf1b94b5006 Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Mon, 4 Mar 2024 18:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineMapper.xml         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 52c63d43..3a32a35a 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
@@ -300,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from ma_machine where ma_id = #{maId} and ma_code = #{maCode}
     </select>
     <select id="getMachineByQrCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
-        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,
+        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, msi.supplier as maVender, 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,m.inspect_man as inspectMan,m.inspect_status as inspectStatus,m.phone as phone
@@ -310,6 +310,7 @@ 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
+                left join ma_supplier_info msi on m.ma_vender = msi.supplier_id
         where m.qr_code = #{qrCode}
     </select>
     <select id="getLeaseProject" resultType="com.bonus.sgzb.base.api.domain.SltAgreementApply">