From fec7be742cb305aecedc807d9b1d6154dff2df52 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 14 Nov 2024 14:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/service/impl/LeaseOutDetailsServiceImpl.java       | 4 ++--
 .../src/main/java/com/bonus/material/ma/domain/Machine.java  | 2 +-
 .../mapper/material/lease/LeaseOutDetailsMapper.xml          | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
index e354fda5..e39fc1d0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Objects;
 
 import com.bonus.common.biz.constant.MaterialConstants;
+import com.bonus.common.biz.enums.MaMachineStatusEnum;
 import com.bonus.common.biz.enums.MaTypeManageTypeEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
@@ -176,7 +177,6 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
 
     // 判断库存是否足够
     private boolean checkStorageIsEnough(LeaseOutDetails record) {
-        String maStatus = "1";
         if (record.getManageType() == MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId() || record.getManageType() == MaTypeManageTypeEnum.SET_DEVICE.getTypeId()) {
             LeaseApplyDetails details = leaseOutDetailsMapper.getOutboundNum(record);
             if (details == null) {
@@ -185,7 +185,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
         } else if (record.getManageType() == MaTypeManageTypeEnum.CODE_DEVICE.getTypeId()) {
             if (!(Objects.equals(0, record.getMaId()) || record.getMaId() == null)) {
                 String status = leaseOutDetailsMapper.getMachineStatus(record);
-                if (!maStatus.equals(status)) {
+                if (String.valueOf(MaMachineStatusEnum.IN_STORE.getStatus()).equals(status)) {
                     return false;
                 }
             }
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 8913cda0..cf76e071 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
@@ -42,7 +42,7 @@ public class Machine extends BaseEntity
     private String preCode;
 
     /** 机具状态（数据字典） */
-    @Excel(name = "机具状态", readConverterExp = "数=据字典")
+    @Excel(name = "机具状态")
     private String maStatus;
 
     /** 二维码 */
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml
index d1ae11f0..2311bac3 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml
@@ -125,9 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ma_id = #{maId}
     </select>
 
-    <select id="getOutboundNum" resultType="com.bonus.material.lease.domain.LeaseOutDetails">
-        SELECT pre_num AS preNum,
-               pre_num - IFNULL(al_num, 0) AS nums
+    <select id="getOutboundNum" resultType="com.bonus.material.lease.domain.LeaseApplyDetails">
+        SELECT id, parent_id as parentId, type_id as typeId, pre_num as preNum, al_num as alNum, `status`, remark
         FROM lease_apply_details
         WHERE id = #{id} AND (pre_num - IFNULL(al_num, 0)) > 0
     </select>