From 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:32:14 +0800
Subject: [PATCH] 成品复测功能修改
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 46c968f..29cfa15 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.dto.InsOrderPlanDTO;
-import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
-import com.ruoyi.inspect.dto.InsProductBindingDto;
-import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -17,6 +14,7 @@
import com.ruoyi.inspect.service.InsOrderPlanService;
import com.ruoyi.inspect.service.InsOrderRatesService;
import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
import io.swagger.annotations.Api;
@@ -198,18 +196,14 @@
/**
*
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
+ * @param insUnqualifiedRetestResultDto
* @return
*/
@ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
@PostMapping("/saveUnqualifiedContext")
- public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+ public Result<?> saveUnqualifiedContext(@RequestBody InsUnqualifiedRetestResultDto insUnqualifiedRetestResultDto) {
+ Map<String, Object> param2 = JSON.parseObject(insUnqualifiedRetestResultDto.getParam(), Map.class);
+ insOrderPlanService.saveUnqualifiedContext(param2, insUnqualifiedRetestResultDto.getCurrentTable(), insUnqualifiedRetestResultDto.getSampleId(), insUnqualifiedRetestResultDto.getOrderId(), insUnqualifiedRetestResultDto.getSonLaboratory());
return Result.success();
}
@@ -274,7 +268,7 @@
@ApiOperation(value = "鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏")
@PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
@GetMapping("/getWorkingHoursByOrderId")
- public Result<IPage<AuxiliaryOutputWorkingHoursTemporary>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ public Result<IPage<AuxiliaryOutputWorkingHoursTemporaryDto>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporaryDto workingHoursTemporary) {
return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
}
--
Gitblit v1.9.3