diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 00e45845..e1e44eb6 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -208,7 +208,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         repairOrderInfo.setOrderTime(ticketsRespVO.getCreateTime());
         repairOrderInfo.setOrderStatus("0");
         repairOrderInfo.setPayMoney(ticketsRespVO.getTotalPrice());
-        repairOrderInfo.setDeptId(Integer.parseInt(deptId + ""));
+        if (ObjectUtil.isNotEmpty(deptId)){
+            repairOrderInfo.setDeptId(Integer.parseInt(deptId + ""));
+        }
 
         // 如果选择了预约还要更新预约记录
         if (ObjectUtil.isNotEmpty(ticketsRespVO.getBookingId())){
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 50c14dab..7200395e 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
@@ -174,8 +174,8 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
                 .set(DlTicketWares::getStatus, respVO.getStatus())
                 .eq(DlTicketWares::getId, respVO.getId())
         );
-        // 如果是通过就还需要把配件信息加入到工单中
-        if (ObjectUtil.isNotEmpty(respVO.getStatus()) && respVO.getStatus().equals("02")){
+        // 如果是通过并且是领料就还需要把配件信息加入到工单中
+        if (ObjectUtil.isNotEmpty(respVO.getStatus()) && respVO.getStatus().equals("02") && respVO.getType().equals("01")){
             // 更新维修工单
             // 计算配件的总价
             BigDecimal reduce = respVO.getWares().stream().map(DlRepairTitem::getItemMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -204,6 +204,29 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
                 item.setItemStatus("08");
             });
             repairTitemService.saveBatch(respVO.getWares());
+        }else if (ObjectUtil.isNotEmpty(respVO.getStatus()) && respVO.getStatus().equals("02") && respVO.getType().equals("02")){
+            // 如果通过退料，也需要更新
+            // 更新维修工单
+            // 计算配件的总价
+            BigDecimal reduce = respVO.getWares().stream().map(DlRepairTitem::getItemMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            repairTicketsService.update(new LambdaUpdateWrapper<DlRepairTickets>()
+                    // 工单子项总数量增加上配件的数量
+                    .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())
+            );
+            // 维修工单子表对应的数据更新
+
+
         }
     }