From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index eeb5f00..df5c991 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.service.ReportService;
@@ -8,10 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -24,14 +22,14 @@
@ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "鏌ヨ姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
- public Result businessStatisticsByDay(){
- return Result.success(reportService.businessStatisticsByDay());
+ public Result businessStatisticsByDay(String startTime,String endTime,String type){
+ return Result.success(reportService.businessStatisticsByDay(startTime,endTime,type));
}
@ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "鏌ヨ妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
- public Result testProductByDay(){
- return Result.success(reportService.testProductByDay());
+ public Result testProductByDay(String startTime,String endTime,String type){
+ return Result.success(reportService.testProductByDay(startTime,endTime,type));
}
@ValueAuth
@ApiOperation(value = "鏌ヨ鏃ュ巻浠诲姟鍥�")
@@ -52,4 +50,25 @@
public Result ScheduleByMe(String date){
return Result.success(reportService.ScheduleByMe(date));
}
+
+ @ValueAuth
+ @ApiOperation(value = "鍚勭珯鐐瑰伐鏃�")
+ @PostMapping("/manHourByStation")
+ public Result manHourByStation(String startTime,String endTime,String sonLaboratory){
+ return Result.success(reportService.manHourByStation(startTime,endTime,sonLaboratory));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮")
+ @PostMapping("/manHourByPerson")
+ public Result manHourByPerson(String startTime,String endTime,String sonLaboratory){
+ return Result.success(reportService.manHourByPerson(startTime,endTime,sonLaboratory));
+ }
+
+ @ValueClassify("缁熻鍥捐〃")
+ @ApiOperation(value = "鏌ヨ绔欑偣鐨勬楠屾椂闀�")
+ @PostMapping("/timeByStation")
+ public Result timeByStation(String startTime, String endTime, Page page,String sonLaboratory){
+ return Result.success(reportService.timeByStation(startTime,endTime,page,sonLaboratory));
+ }
}
--
Gitblit v1.9.3