From 36fb6992f95f578ec94ea8cd9f795105326646cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Sat, 26 Oct 2024 16:32:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E5=85=A5=E5=BA=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockOperate/service/impl/DlRepairSoServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
index e071a56b..ac353441 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
@@ -558,8 +558,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
         // 更新采购单的状态，如果是全部入库完了，就是03已入库，反之不变
         // 查该采购单的所有采购配件
         List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, reqVO.getId()));
-        // 过滤出入库数量等于采购数量的数据
-        List<DlRepairSoi> allInSois = sois.stream().filter(item -> item.getInCount().equals(item.getGoodsCount())).collect(Collectors.toList());
+        // 过滤出入库数量大于等于采购数量的数据 （入库数量可以大于采购的数量）
+        List<DlRepairSoi> allInSois = sois.stream().filter(item -> item.getInCount() >= item.getGoodsCount()).collect(Collectors.toList());
         // 如果allInSois的size就是sois的size，那就是全部都入库了
         if (CollectionUtil.isNotEmpty(allInSois) && allInSois.size() == sois.size()) {
             // 更新采购单的状态为已入库

From 0f54e30320fd36fdc2848471adad35a55bba07ff Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Sat, 26 Oct 2024 16:56:17 +0800
Subject: [PATCH 2/2] 1

---
 .../module/booking/service/impl/DlRepairBookingServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
index 2ffa989d..af024ebf 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
@@ -233,6 +233,7 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
      * @date 15:52 2024/10/26
      **/
     @Override
+    @TenantIgnore
     public List<UserDTO> getAllServicer(Long tenantId) {
         return roleApi.selectUserListByRoleCode(tenantId, RepairRoleEnum.ADVISOR.getCode());
     }