From 55db6f66c093c07df100cb0e609091030c2a4925 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 24 九月 2026 09:19:20 +0800
Subject: [PATCH] feat(process): 完善检验委托单功能实现绑定和关联管理 - 实现检验委托单与成品下单的绑定功能，包括新增绑定、解除绑定和变更绑定关系 - 添加检验委托单关联状态查询和未绑定委托单筛选功能 - 实现检验委托单绑定日志记录和报告同步功能
---
cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
index 47bf3f2..63b226d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.utils.JackSonUtil;
-import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.dto.InsPlaceOrderDto;
import com.ruoyi.process.dto.InspectionOrderDto;
import com.ruoyi.process.pojo.InspectionOrder;
import com.ruoyi.process.service.InspectionOrderService;
@@ -13,9 +12,9 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import org.springframework.security.access.prepost.PreAuthorize;
import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
/**
* <p>
@@ -54,6 +53,32 @@
return Result.success(inspectionOrderService.addInspectionOrder(InspectionOrder));
}
+ @ApiOperation(value = "鏌ヨ鏈粦瀹氭楠屽鎵樺崟")
+ @GetMapping("/pageUnboundInspectionOrder")
+ public Result<IPage<InspectionOrder>> pageUnboundInspectionOrder(InspectionOrder inspectionOrder, Page page) {
+ return Result.success(inspectionOrderService.pageUnboundInspectionOrder(page, inspectionOrder));
+ }
+
+ @ApiOperation(value = "鑾峰彇鎴愬搧涓嬪崟鍏宠仈鐨勫鎵樺崟淇℃伅")
+ @GetMapping("/getInspectionOrderForPlaceOrder")
+ public Result<InspectionOrderDto> getInspectionOrderForPlaceOrder(Integer inspectionOrderId) {
+ return Result.success(inspectionOrderService.getInspectionOrderForPlaceOrder(inspectionOrderId));
+ }
+
+ @ApiOperation(value = "鏂板鎴愬搧涓嬪崟骞剁粦瀹氭楠屽鎵樺崟")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/addInsOrderWithInspectionOrder")
+ public Result<Integer> addInsOrderWithInspectionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(inspectionOrderService.addInsOrderWithInspectionOrder(insPlaceOrderDto));
+ }
+
+ @ApiOperation(value = "鍙樻洿妫�楠屽鎵樺崟鍏宠仈")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/changeBinding")
+ public Result changeBinding(Integer insOrderId, Integer inspectionOrderId, String reason) {
+ return Result.success(inspectionOrderService.changeBinding(insOrderId, inspectionOrderId, reason));
+ }
+
/**
* 濮旀墭鍗曟楠屼慨鏀�
* @return
@@ -82,28 +107,6 @@
@GetMapping("/getInspectionOrderOne")
public Result<InspectionOrderDto> getInspectionOrderOne(Integer inspectionOrderId){
return Result.success(inspectionOrderService.getInspectionOrderOne(inspectionOrderId));
- }
-
- /**
- * 濮旀墭鍗曟楠屾煡鐪嬭鎯�
- * @return
- */
- @ApiOperation(value = "鏍规嵁鎴愬搧璁㈠崟鏌ヨ濮旀墭鍗曡鎯�")
- @GetMapping("/getInspectionOrderByInsOderId")
- public Result<InspectionOrderDto> getInspectionOrderByInsOderId(Integer insOrderId){
- return Result.success(inspectionOrderService.getInspectionOrderByInsOderId(insOrderId));
- }
-
- /**
- * 濮旀墭鍗曟煡璇㈡垚鍝佽鍗�
- * @return
- */
- @ApiOperation(value = "濮旀墭鍗曟煡璇㈡垚鍝佽鍗�")
- @PostMapping("/getInsOrderOnInspection")
- public Result<IPage<InsOrder>> getInsOrderOnInspection(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InsOrder insOrder = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
- return Result.success(inspectionOrderService.getInsOrderOnInspection(page, insOrder));
}
/**
--
Gitblit v1.9.3