From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 52b75c7..086eed0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -15,6 +15,9 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.service.InsOrderService;
+import com.ruoyi.inspect.service.InsOrderDeletionService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.inspect.service.InsOrderTemplateService;
import com.ruoyi.inspect.service.InsProductService;
import com.ruoyi.inspect.service.InsSampleService;
@@ -40,6 +43,8 @@
public class InsOrderController {
private InsOrderService insOrderService;
+
+ private InsOrderDeletionService insOrderDeletionService;
private InsSampleService insSampleService;
@@ -228,16 +233,12 @@
return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
}
- @Operation(summary = "鍒犻櫎閫�鍥炶鍗�")
+ @Operation(summary = "鍒犻櫎濮旀墭鍗曞強鍏ㄩ儴鍏宠仈璁板綍")
+ @PreAuthorize("@ss.hasPermi('delete:insOrder')")
+ @Log(title = "濮旀墭鍗曞強鍏宠仈璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping("/delInsOrder")
- public Result<?> delInsOrder(Integer insOrderId) {
- // 鏌ヨ璁㈠崟
- InsOrder order = insOrderService.getById(insOrderId);
- if (!(order.getState().equals(2) || order.getState().equals(3))) {
- throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
- }
-
- return Result.success(insOrderService.removeById(insOrderId));
+ public Result<?> delInsOrder(@RequestParam Integer insOrderId) {
+ return Result.success(insOrderDeletionService.deleteOrder(insOrderId));
}
@Operation(summary = "鎴愬搧鏍囩鎵撳嵃")
--
Gitblit v1.9.3