From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 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..48acce4 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
@@ -17,6 +17,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;
@@ -176,40 +177,27 @@
return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
}
- @ApiOperation("鑾峰彇涓嶅悎鏍兼暟鎹�")
- @GetMapping("/getInsProductUnqualified")
- public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
- return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
- }
-
@ApiOperation("鏂板涓嶅悎鏍煎娴嬩俊鎭�")
@PostMapping("/addUnqualifiedRetest")
- public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
- // 鑾峰彇妫�楠屽璞＄殑id
- List<Integer> ids = (List<Integer>) params.get("ids");
- return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
+ public Result<?> addDisqualificationRetest(@RequestBody List<InsProduct> insProductsList) {
+ return Result.success(insOrderPlanService.addDisqualificationRetest(insProductsList));
}
@ApiOperation("鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�")
@GetMapping("/getInsProductUnqualifiedRetest")
- public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
- return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
+ public Result<?> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto) {
+ return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(insOrderPlanProductDto));
}
/**
*
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
* @return
*/
- @ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
+ @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 SaveInsContextDto saveInsContextDto) {
+ Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
+ insOrderPlanService.saveUnqualifiedContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
return Result.success();
}
@@ -274,7 +262,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