Merge remote-tracking branch 'origin/dev' into dev

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java

@@ -348,5 +348,19 @@ public class DlRepairTicketsController {
         dlRepairTicketsService.updateTicket(respVO);
         return CommonResult.ok();
     }
+
+    /**
+     * 删除工单
+     *
+     * @author 小李
+     * @date 20:05 2024/11/1
+     * @param id 工单ID
+    **/
+    @DeleteMapping("/remove")
+    @Operation(summary = "删除工单")
+    public CommonResult<?> removeTicketById(@RequestParam("id") String id) {
+        dlRepairTicketsService.removeTicketById(id);
+        return CommonResult.ok();
+    }
 }
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java

@@ -226,4 +226,13 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
      * @param respVO 请求对象
      **/
     void updateTicket(DlRepairTicketsRespVO respVO);
+
+    /**
+     * 删除工单
+     *
+     * @author 小李
+     * @date 20:05 2024/11/1
+     * @param id 工单ID
+     **/
+    void removeTicketById(String id);
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java

@@ -217,7 +217,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
 //        });
 
 
-
         // 门店信息
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
         DeptRespDTO dept = deptApi.getDept(deptId);
@@ -1176,6 +1175,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             item.eq(DlTicketWares::getTicketId, id)
                     .notIn(DlTicketWares::getStatus, status);
         }));
+        if (CollectionUtil.isNotEmpty(list)) {
             // 查配件申请表的所有已领取数量小于申请数量的子表信息
             List<String> ids = list.stream().map(DlTicketWares::getId).collect(Collectors.toList());
             List<DlTwItem> twItems = twItemService.list(new LambdaQueryWrapper<DlTwItem>().and(item -> {
@@ -1223,6 +1223,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
                 // 重新计算维修工单
                 return computeTicket(id);
             }
+        }
         return true;
     }
 
@@ -1512,9 +1513,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
     /**
      * 修改工单主表，只是主表
      *
+     * @param respVO 请求对象
      * @author 小李
      * @date 10:25 2024/10/30
-     * @param respVO 请求对象
      **/
     @Override
     @DSTransactional
@@ -1528,6 +1529,24 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             throw exception0(500, "系统异常");
         }
     }
+
+    /**
+     * 删除工单
+     *
+     * @param id 工单ID
+     * @author 小李
+     * @date 20:05 2024/11/1
+     **/
+    @Override
+    @DSTransactional
+    public void removeTicketById(String id) {
+        // 删除订单
+        repairOrderInfoService.remove(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, id));
+        // 删除工单
+        baseMapper.deleteById(id);
+        // 删除工单子表
+        titemService.remove(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, id));
+    }
 }
 
 

yudao-server/src/main/resources/application-local.yaml

@@ -56,6 +56,8 @@ spring:
           #          url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例
           username: lanan_dev
           password: lighting@2024
+#          username: lanan
+#          password: 123456
           #          username: sa # SQL Server 连接的示例
           #          password: Yudao@2024 # SQL Server 连接的示例
           #          username: SYSDBA # DM 连接的示例