From 7baabc20800670388eeb074c12868b8ec8ec139d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 06 三月 2025 09:51:10 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 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 d61e1f9..4e8624e 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
@@ -7,6 +7,7 @@
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.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -59,14 +60,14 @@
}
- @ApiOperation(value = "鎵ц妫�楠屾搷浣�")
- @PostMapping("/doInsOrder")
+ @ApiOperation(value = "鏌ヨ妫�楠屾搷浣�")
+ @GetMapping("/doInsOrder")
public Result<?> doInsOrder(Integer id, String laboratory) {
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
+ @GetMapping("/getInsProduct")
public Result<?> getInsProduct(InsOrderPlanProductDto insOrderPlanProductDto) {
return Result.success(insOrderPlanService.getInsProduct(insOrderPlanProductDto));
}
@@ -79,7 +80,7 @@
}
@ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
- @PostMapping("/upPlanUser2")
+ @GetMapping("/upPlanUser2")
public Result<?> upPlanUser2(Integer orderId) {
return Result.success(insOrderPlanService.upPlanUser2(orderId));
}
@@ -105,21 +106,11 @@
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
-
- /**
- *
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
- * @return
- */
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
- public Result<?> saveInsContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveInsContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+ public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
+ Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
+ insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
return Result.success();
}
@@ -138,7 +129,7 @@
@ApiOperation(value = "鍒犻櫎闄勪欢")
- @PostMapping("/delfile")
+ @DeleteMapping("/delfile")
public Result<?> delfile(Integer id) {
return Result.success(insOrderFileService.removeById(id));
}
@@ -162,25 +153,25 @@
@ApiOperation(value = "鐢电紗閰嶇疆,鏌ョ湅閰嶇疆鏍囪瘑")
- @PostMapping("/getCableTag")
+ @GetMapping("/getCableTag")
public Result<?> getCableTag(Integer id, String laboratory) {
return Result.success(insOrderPlanService.getCableTag(id, laboratory));
}
@ApiOperation(value = "鍘熸潗鏂�,鏌ョ湅閰嶇疆鏍囪瘑")
- @PostMapping("/getRawMaterialTag")
+ @GetMapping("/getRawMaterialTag")
public Result<?> getRawMaterialTag(Integer id, String laboratory) {
return Result.success(insOrderPlanService.getRawMaterialTag(id, laboratory));
}
@ApiOperation(value = "鏌ョ湅閲嶅鏍囪瘑")
- @PostMapping("/getRepetitionTag")
+ @GetMapping("/getRepetitionTag")
public Result<?> getRepetitionTag(Integer id, String laboratory, String cableTag) {
return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
}
@ApiOperation("鑾峰彇涓嶅悎鏍兼暟鎹�")
- @PostMapping("/getInsProductUnqualified")
+ @GetMapping("/getInsProductUnqualified")
public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
}
@@ -194,7 +185,7 @@
}
@ApiOperation("鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�")
- @PostMapping("/getInsProductUnqualifiedRetest")
+ @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));
}
@@ -264,7 +255,7 @@
@ApiOperation(value = "鍒犻櫎鐗规畩妫�楠岄」缁戝畾淇℃伅")
- @GetMapping("/delProductTreeByProductId")
+ @DeleteMapping("/delProductTreeByProductId")
public Result<?> delProductTreeByProductId(Integer productId) {
return Result.success(insProductService.removeBindingProductTree(productId));
}
--
Gitblit v1.9.3