From 0debf5b7bb0246eaef1397975cdb16f4adb9e8d9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 29 十月 2026 14:36:31 +0800
Subject: [PATCH] refactor(inspection-order): 1.检验委托单绑定机制支持多次下单 2.合格率统计口径调整 3.外购铜导体推送入库MES增加米重 4.报告英文字段调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 217b5b3..727f4a1 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
@@ -54,7 +54,7 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
@GetMapping("/selectInsOrderParameter")
- public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
+ public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
@@ -90,6 +90,12 @@
@GetMapping("/getInsOrder")
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯呭垪琛�")
+ @PostMapping("/getInsOrderList")
+ public Result<?> getInsOrderList(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.getInsOrderList(insPlaceOrderDto.getSelectOrderIds()));
}
@ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@@ -202,13 +208,7 @@
@ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
@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));
+ return Result.success(insOrderService.deleteReturnedOrder(insOrderId));
}
@ApiOperation(value = "鎴愬搧鏍囩鎵撳嵃")
--
Gitblit v1.9.3