From 0aa51bfcf43ea36240dcadc5559c09575406e687 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 15 Nov 2024 09:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E6=8E=A8=E9=80=81=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 6 +++--- .../src/main/resources/mapper/base/MaMachineMapper.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 1cd61c4..316c694 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -265,9 +265,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } // 更新 (ma_machine 设备表)的状态 leaseOutDetailsMapper.updateMaMachineStatus(record); - log.error("check0010"); + log.error("check0010{}",record.getMaId()); //查询装备是否推送到租赁 - /* MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId())); + MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId())); log.error("check0011"); if (maMachine != null && maMachine.getPushStatus().equals(1)) { //同步租赁商城机具状态 @@ -284,7 +284,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { log.error("同步租赁商城机具状态失败"); throw new RuntimeException("同步租赁商城机具状态失败"); } - }*/ + } log.error("check0012"); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml index 82819b0..3cbd1ab 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml @@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, 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,