From 0ed23adb887e3e4be6ac44e81c39dc3d3fdfb300 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 19 Nov 2024 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=EF=BC=8C=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=AA=E5=95=86=E5=93=81=E5=8F=AF=E4=BB=A5=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=20=E8=BF=9B=E8=B4=A7=E4=BB=B7=E3=80=81=E6=94=B6=E4=BB=B7?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E7=B1=BB=E3=80=81=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=E6=8C=89=E5=88=86=E7=B1=BB=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=8C=89=E5=88=86=E7=B1=BB=E8=BF=9B=E8=A1=8C=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DlRepairSoServiceImpl.java   | 49 ++++++++++---------
 .../stockOperate/vo/DlRepairSoRespVO.java     |  3 ++
 2 files changed, 30 insertions(+), 22 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 f4cef3dc..39eefd48 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
@@ -163,29 +163,34 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
         });
         repairSoiService.saveBatch(repairSoRespVO.getGoodsList());
 
-        // 操作配件库存表
+        // 操作配件表
+        // 前端选择了配件生成采购单的时候，可能会改配件的一些信息，但不知道会改什么，直接拿到全部，重新更新
+        List<RepairWares> waresList = repairSoRespVO.getWaresList();
+        waresService.updateBatchById(waresList);
+
+        // 操作配件库存表---应该是弃用了
         // 获取所有需要操作的数据----生成采购单的时候，不直接操作库存，放到下面的inWares方法去操作
-       if (repairSoRespVO.getSoType() != null && !repairSoRespVO.getSoType().equals("01")){
-           List<DlRepairSoi> goodsList = repairSoRespVO.getGoodsList();
-           List<String> ids = goodsList.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList());
-           List<RepairWares> repairWares = waresService.listByIds(ids);
-           // 更新库存和进价
-           List<RepairWares> newWares = repairWares.stream().map(item -> {
-               // 取数据
-               DlRepairSoi repairSoi = goodsList.stream().filter(i -> i.getGoodsId().equals(item.getId())).collect(Collectors.toList()).get(0);
-               // 设置新值
-               // 如果是采购入库，数量+，如果是领料出库，数量-
-               // 01, 03 是采购 02 是领料
-               BigDecimal count = new BigDecimal(repairSoi.getGoodsCount());
-               RepairWares wares = new RepairWares();
-               wares.setId(item.getId());
-               wares.setStock("02".equals(repairSoRespVO.getSoType()) ? item.getStock().subtract(count) : item.getStock().add(count));
-               // 更新进价
-               wares.setPurPrice(repairSoi.getGoodsPrice());
-               return wares;
-           }).collect(Collectors.toList());
-           waresService.updateBatchById(newWares);
-       }
+//       if (repairSoRespVO.getSoType() != null && !repairSoRespVO.getSoType().equals("01")){
+//           List<DlRepairSoi> goodsList = repairSoRespVO.getGoodsList();
+//           List<String> ids = goodsList.stream().map(DlRepairSoi::getGoodsId).collect(Collectors.toList());
+//           List<RepairWares> repairWares = waresService.listByIds(ids);
+//           // 更新库存和进价
+//           List<RepairWares> newWares = repairWares.stream().map(item -> {
+//               // 取数据
+//               DlRepairSoi repairSoi = goodsList.stream().filter(i -> i.getGoodsId().equals(item.getId())).collect(Collectors.toList()).get(0);
+//               // 设置新值
+//               // 如果是采购入库，数量+，如果是领料出库，数量-
+//               // 01, 03 是采购 02 是领料
+//               BigDecimal count = new BigDecimal(repairSoi.getGoodsCount());
+//               RepairWares wares = new RepairWares();
+//               wares.setId(item.getId());
+//               wares.setStock("02".equals(repairSoRespVO.getSoType()) ? item.getStock().subtract(count) : item.getStock().add(count));
+//               // 更新进价
+//               wares.setPurPrice(repairSoi.getGoodsPrice());
+//               return wares;
+//           }).collect(Collectors.toList());
+//           waresService.updateBatchById(newWares);
+//       }
     }
 
     /**
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java
index da624f9d..ef28aff8 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoRespVO.java
@@ -18,4 +18,7 @@ public class DlRepairSoRespVO extends DlRepairSo {
 
     // 商品List
     private List<DlRepairSoi> goodsList;
+
+    // 配件List
+    private List<RepairWares> waresList;
 }