From f61004114d2b8e7af80ce559386143f9b1b8b660 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Fri, 15 Nov 2024 16:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9BBUG=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DlRepairSoServiceImpl.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 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 6e420e7f..f4cef3dc 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
@@ -242,7 +242,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
                 sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(repairSoiByTwItem -> {
                     if (so.getSoType().equals("02")){
                         dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() - repairSoiByTwItem.getGoodsCount());
-                        dlTwItem.setWaresStatus("02");
+                        // 不操作配件申请表子表的状态
+//                        dlTwItem.setWaresStatus("02");
                     }else {
                         dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() + repairSoiByTwItem.getGoodsCount());
                     }
@@ -325,13 +326,13 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
         // 查最新的子表信息
         DlRepairSo so = baseMapper.selectById(id);
         List<DlTwItem> list = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId()));
-        // 判断是部分完成还是全部完成
-        DlTicketWares dlTicketWares = new DlTicketWares();
-        dlTicketWares.setId(so.getTwId());
-        List<DlTwItem> flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList());
-        dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04");
+        // 判断是部分完成还是全部完成----不需要判断了
+//        DlTicketWares dlTicketWares = new DlTicketWares();
+//        dlTicketWares.setId(so.getTwId());
+//        List<DlTwItem> flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList());
+//        dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04");
         // 更新主表的状态
-        ticketWaresService.updateById(dlTicketWares);
+//        ticketWaresService.updateById(dlTicketWares);
 
         // 通知仓库
         repairWorkerService.sentMessage(Long.valueOf(so.getCreator()), so.getUserName() + "已确认领料单:" + so.getSoNo());
@@ -447,8 +448,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
             //入库数量
             inWares.setInCount(filterSoi.getInCount());
             inWares.setId(null);
-            //采购品中入库数量字段累加
-            item.setInCount(item.getInCount() == null ? 0 : item.getInCount() + filterSoi.getInCount());
+            //采购品中入库数量字段累加---这里item.getInCount 是null的时候，应该是filterSoi的inCount而不是0
+            item.setInCount(item.getInCount() == null ? filterSoi.getInCount() : item.getInCount() + filterSoi.getInCount());
             inWaresList.add(inWares);
         });
         //更新采购品