From e710a3df1c395eeb1f00a491e840e7ee3a91a1a9 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Fri, 20 Dec 2024 18:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/basic/service/impl/BmQrBoxServiceImpl.java     | 5 +++--
 .../purchase/service/impl/PurchaseCheckInfoServiceImpl.java | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
index 1aba609b..4d05e67e 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
@@ -110,7 +110,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
         boxBindList.removeIf(Objects::isNull);
         boxInfoBindVo.setBindMaTotal(boxBindList.size());
         boxBindList.removeIf(item -> item.getMaStatus() == null);
-        boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatus().toString()));
+        boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatusName()));
         if (Objects.nonNull(bmQrBoxInfo.getMaTypeId())) {
             boxBindList.removeIf(item -> item.getMaTypeId() == null || !Objects.equals(item.getMaTypeId(), bmQrBoxInfo.getMaTypeId()));
         }
@@ -149,7 +149,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
         List<BmQrBoxInfo> boxBindList = bmQrBoxMapper.getBoxBindList(boxBindWarehouseDto.getBoxId());
         boxBindList.removeIf(Objects::isNull);
         boxBindList.removeIf(item -> item.getMaStatus() == null);
-        boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatus().toString()));
+        boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatusName()));
         boxBindList.removeIf(item -> item.getMaTypeId() == null || !Objects.equals(item.getMaTypeId(), boxBindWarehouseDto.getMaTypeId()));
 
 
@@ -173,6 +173,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
         // 更新新购验收明细状态
         purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Math.toIntExact(purchaseDetailId));
 
+        // TODO 缺少修改TmTask表状态
         // ---------------- 返回前端 -------------------------------------
         return AjaxResult.success("入库成功");
     }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 7af0e07a..01d8de0d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -87,14 +87,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                                     MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType()) && getPurchaseMaCodeCount(o.getTaskId(), o.getTypeId()) > 0)
                             .collect(Collectors.toList());
                 }
-                //针对于app查询可能存在的验收图片
-                extractedFile(purchaseCheckDetailsList);
             } else {
                 purchaseQueryDto.setStatusList(null);
                 purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
-                //针对于app查询可能存在的验收图片
-                extractedFile(purchaseCheckDetailsList);
             }
+            //针对于app查询可能存在的验收图片
+            extractedFile(purchaseCheckDetailsList);
             purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetailsList);
         }
         return purchaseCheckDtoResult;