From 268c5321e4bbe535ddaab552666598f7fadeccf3 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Mon, 22 Jan 2024 21:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LeaseOutDetailsServiceImpl.java      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

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 803a6b40..66e81ff1 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
@@ -35,6 +35,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
 
     /**
      * 根据任务id查询出库数据
+     *
      * @param parentId 任务id
      * @return 出库数据集合
      */
@@ -45,6 +46,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
 
     /**
      * 领料出库处理
+     *
      * @param record 出库对象
      * @return 结果
      */
@@ -55,9 +57,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
         if (StringUtils.isNull(record)) {
             return AjaxResult.error("领料出库失败,请检查参数是否填写完整!");
         }
-        if (!(Integer.valueOf(0) == record.getMaId())){
+        if (!(Integer.valueOf(0) == record.getMaId() || record.getMaId() == null)) {
             String status = leaseOutDetailsMapper.getMachineStatus(record);
-            if (!maStatus.equals(status)){
+            if (!maStatus.equals(status)) {
                 return AjaxResult.error("领料出库失败,该设备不是在库状态！");
             }
         }
@@ -80,23 +82,23 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             if (insertSelectiveNum > 0) {
                 if (updateMaTypeStockNum > 0) {
                     // if (updateMaMachineStatus > 0) {
-                        // if (insertAgreementInfo > 0) {
+                    // if (insertAgreementInfo > 0) {
                     List<LeaseApplyDetails> leaseApplyDetailsList = leaseApplyDetailsMapper.getByParentId(record.getParentId());
                     int i = 0;
-                    for (LeaseApplyDetails bean : leaseApplyDetailsList){
-                        if (Objects.equals(bean.getPreNum(), bean.getAlNum())){
+                    for (LeaseApplyDetails bean : leaseApplyDetailsList) {
+                        if (Objects.equals(bean.getPreNum(), bean.getAlNum())) {
                             i++;
                         }
                     }
                     String taskId = leaseOutDetailsMapper.getTaskId(record.getParentId());
-                    if (i == leaseApplyDetailsList.size()){
-                        leaseOutDetailsMapper.updateTaskStatus(taskId,35);
-                    }else {
-                        leaseOutDetailsMapper.updateTaskStatus(taskId,34);
+                    if (i == leaseApplyDetailsList.size()) {
+                        leaseOutDetailsMapper.updateTaskStatus(taskId, 35);
+                    } else {
+                        leaseOutDetailsMapper.updateTaskStatus(taskId, 34);
                     }
                     return AjaxResult.success("领料出库成功!");
-                        // }
-                        // return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
+                    // }
+                    // return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
                     // }
                     // return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
                 }