From 9b67c44fe4e6c22da06e97392df68b65b6a3b061 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 23 Aug 2024 12:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/mapper/WorkSiteDirectManageMapper.java | 2 +-
 .../material/service/impl/WorkSiteDirectManageImpl.java  | 9 ++++-----
 .../mapper/material/WorkSiteDirectManageMapper.xml       | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
index 1b6f6ab..fc72833 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
@@ -44,7 +44,7 @@ public interface WorkSiteDirectManageMapper {
 
     int batchDel(@Param("ids") ArrayList<Integer> ids);
 
-    String getMachineStatus(LeaseOutDetails leaseOutDetails);
+    DirectApplyInfo getMachineStatus(LeaseOutDetails leaseOutDetails);
 
     int updateLeaseApplyDetailsOutNum(@Param("record")LeaseOutDetails leaseOutDetails);
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
index 0d03f25..379471c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
@@ -13,7 +13,6 @@ import com.bonus.sgzb.material.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -179,7 +178,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
     @Transactional(rollbackFor = Exception.class)
     public int insertLeaseOutDetail(List<LeaseOutDetails> leaseOutDetails, TmTask lTask) {
         int res = 0;
-        String maStatus = "15";
+        String maStatus = "16";
         double outNum = 0.1;
         if (StringUtils.isNull(leaseOutDetails)) {
             log.info("领料出库失败,请检查参数是否填写完整!");
@@ -187,9 +186,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
         }
         for (LeaseOutDetails leaseOutDetail : leaseOutDetails) {
             if (!(Objects.equals(Integer.valueOf(0), leaseOutDetail.getMaId()) || leaseOutDetail.getMaId() == null)) {
-                String status = workSiteDirectManageMapper.getMachineStatus(leaseOutDetail);
-                if (!maStatus.equals(status)) {
-                    log.info("领料出库失败,该设备不是在库状态！");
+                DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getMachineStatus(leaseOutDetail);
+                if (!maStatus.equals(directApplyInfo.getStatus())) {
+                    log.info("领料出库失败,该设备不是再用状态！");
                     return res;
                 }
             }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
index e9e9686..ab00e53 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
@@ -431,8 +431,8 @@
     <select id="getDirectApplyInfoById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
         select * from direct_apply_info where id = #{id}
     </select>
-    <select id="getMachineStatus" resultType="java.lang.String">
-        select ma_status
+    <select id="getMachineStatus" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
+        select ma_status as status
         from ma_machine
         where ma_id = #{maId}
     </select>