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/InsOrderController.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 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 b8f1002..04abec3 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
@@ -99,7 +99,6 @@
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
})
-
@PostMapping("/upInsOrderOfState")
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
@@ -133,25 +132,6 @@
@GetMapping("/selectSampleAndProductByOrderId")
public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto){
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻")
- @GetMapping("/costStatistics")
- public Result<?> costStatistics(Page page, CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
- @GetMapping("/costStatistics2")
- public Result<?> costStatistics2(CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics2(costStatisticsDto));
- }
-
-
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
- @GetMapping("/selectSampleDefects")
- public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
- return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
}
@@ -194,13 +174,6 @@
Integer state = (Integer) param.get("state");
insProductService.checkUpdate(orderId,state);
return Result.success();
- }
-
-
- @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
- @GetMapping("/export")
- public void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response) throws ServletException, IOException {
- insOrderService.export(costStatisticsDto,response);
}
@@ -278,8 +251,8 @@
}
@ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllInsOrderExport")
- public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+ @GetMapping("/rawAllInsOrderExport")
+ public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response){
insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
}
--
Gitblit v1.9.3