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 60ce24df..d6e60bfe 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 @@ -274,24 +274,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl() -// // 工单子项总数量增加上配件的数量 -// .setSql("count = count + " + repairItemList.size()) -// // 工单配件总价 -// .setSql("part_price = part_price + " + reduce) -// // 工单总价 -// .setSql("total_price = total_price + " + reduce) -// // 参考成本 -// .setSql("cost = cost + " + reduce) -// // 参考毛利 -// .setSql("profit = profit + " + reduce) -// // 领料状态 -// .set(DlRepairTickets::getPartStatus, "02") -// .eq(DlRepairTickets::getId, ticketMainId) -// ); // 更新维修工单子表----需要合并相同的配件,故修改 // 先查维修工单的子表中的配件相关的信息 List oldTitem = repairTitemService.list(new LambdaQueryWrapper().and(i -> i.eq(DlRepairTitem::getTicketId, ticketMainId).eq(DlRepairTitem::getItemType, "02"))); @@ -336,6 +318,17 @@ public class DlTicketWaresServiceImpl extends ServiceImpl updateWares = repairItemList.stream().map(item -> { + RepairWares wares = new RepairWares(); + wares.setId(item.getPartId()); + wares.setPrice(item.getItemPrice()); + return wares; + }).collect(Collectors.toList()); + repairWaresService.updateBatchById(updateWares); + } + // 发送通过的消息给仓库 RoleReqDTO roleInfo = roleApi.getRoleInfo(RepairRoleEnum.WAREHOUSE.getCode()); List ids = permissionApi.getUserIdByRoleId(roleInfo.getId()); @@ -351,55 +344,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl() -// // 工单子项总数量增加上配件的数量 -// .setSql("count = count - " + respVO.getWares().size()) -// // 工单配件总价 -// .setSql("part_price = part_price - " + reduce) -// // 工单总价 -// .setSql("total_price = total_price - " + reduce) -// // 参考成本 -// .setSql("cost = cost - " + reduce) -// // 参考毛利 -// .setSql("profit = profit - " + reduce) -// // 领料状态 -// .set(DlRepairTickets::getPartStatus, "02") -// .eq(DlRepairTickets::getId, respVO.getTicketId()) -// ); -// // 维修工单子表对应的数据更新 -// // 先查数据出来 -// List list = repairTitemService.list(new LambdaQueryWrapper().and(i -> { -// i.eq(DlRepairTitem::getTicketId, respVO.getTicketId()) -// .in(DlRepairTitem::getPartId, respVO.getWares().stream().map(DlRepairTitem::getPartId).collect(Collectors.toList())); -// })); -// list.forEach(item -> { -// respVO.getWares().stream().filter(i -> i.getPartId().equals(item.getPartId())).findFirst().ifPresent(i -> { -// // 如果只是退部分就减少数量 -// if (!i.getItemCount().equals(item.getItemCount())) { -// repairTitemService.update(new LambdaUpdateWrapper() -// .setSql("item_count = item_count - " + i.getItemCount()) -// .setSql("item_money = item_money - " + i.getItemMoney()) -// .and(x -> { -// x.eq(DlRepairTitem::getTicketId, respVO.getTicketId()).eq(DlRepairTitem::getPartId, item.getPartId()); -// }) -// ); -// } else { -// // 如果是全部退了,就直接删掉数据 -// repairTitemService.removeById(item.getId()); -// } -// }); -// }); -// -// // 发送没有通过的消息给员工 -// DlTicketWares ticketWares = baseMapper.selectById(respVO.getId()); -// repairWorkerService.sentMessage(ticketWares.getRepairId(), "您的配件申请单被驳回了"); -// } } /**