From 6c86a132bef48c72ddc1accf472e74ba02b1619b Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Sat, 23 Nov 2024 14:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=85=8D=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E7=94=B1=E5=91=98=E5=B7=A5=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=94=B9=E4=BB=93=E5=BA=93=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DlTicketWaresServiceImpl.java        | 23 +------------------
 .../tickets/vo/DlTicketWaresRespVO.java       |  3 +++
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
index d1acbb02..7323477e 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
@@ -498,31 +498,10 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
             // 更新库存
             repairWaresService.updateBatchById(newWares);
         }
-//        /*
-//           同理，通知领料的数量可能与实际需要的数量不一致，需要重新计算状态
-//         */
-//        // 先查老数据，领料才需要更新
-//        if (type.equals("02")) {
-//            List<DlTwItem> oldData = twItemService.list(new LambdaQueryWrapper<DlTwItem>().in(DlTwItem::getId, respVO.getItems().stream().map(DlTwItem::getId).collect(Collectors.toList())));
-//            // 构造新数据
-//            List<DlTwItem> newData = oldData.stream().map(item -> {
-//                DlTwItem dlTwItem = new DlTwItem();
-//                dlTwItem.setId(item.getId());
-//                respVO.getRepairSois().stream()
-//                        .filter(i -> i.getGoodsId().equals(item.getWaresId()))
-//                        .findFirst()
-//                        .ifPresent(repairSoi -> {
-//                            dlTwItem.setWaresCouldCount(repairSoi.getGoodsCount());
-//                            dlTwItem.setWaresStatus(repairSoi.getGoodsCount().equals(item.getWaresCount()) ? "04" : item.getWaresStatus());
-//                        });
-//                return dlTwItem;
-//            }).collect(Collectors.toList());
-//            twItemService.updateBatchById(newData);
-//        }
         //插入记录
         //最后记录操作日志--创建工单
         repairRecordsService.saveRepairRecord(respVO.getTicketId(), null, "02".equals(type) ? RecordTypeEnum.TZLL.getCode() : RecordTypeEnum.TZTL.getCode(),
-                ("02".equals(type) ? "通知领料" : "通知退料") + "，配件明细：" + remarkStr, null);
+                ("02".equals(type) ? "通知领料" : "通知退料") + "，配件明细：" + remarkStr, respVO.getImages());
         // 通知维修工
         // 查维修工的userId
         repairWorkerService.sentMessage(respVO.getRepairId(), type.equals("02") ? "您有新的领料单需要确认" : "您有新的退料单需要确认");
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresRespVO.java
index 111abd9b..1e481867 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresRespVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresRespVO.java
@@ -33,4 +33,7 @@ public class DlTicketWaresRespVO extends DlTicketWares {
 
     /** 更新配件库子表价格 */
     private List<RepairWares> repairWaresList;
+
+    /** 通知领料时上传的图片 */
+    private String images;
 }