From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 7d548a8..4998c9c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -14,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
import java.sql.Date;
@RestController
@@ -73,15 +74,14 @@
@ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
@SaCheckPermission("selectReportingWorks.search")
- @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
+ @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectDate}/{orderId}")
public Result selectReportingWork(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String orderId,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+ return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectDate,orderId,reportingWork));
}
@@ -89,9 +89,11 @@
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
@SaCheckPermission("selectReportingWorks.delete")
@PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
- public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
- @PathVariable String thisProcess,@PathVariable String userId
- ,@PathVariable String userName){
+ public Result deleteWork(@PathVariable String reportingWorkId,
+ @PathVariable String processId,
+ @PathVariable String thisProcess,
+ @PathVariable String userId
+ ,@PathVariable String userName){
return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
@@ -99,16 +101,15 @@
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
@SaCheckPermission("qualityInspectionReview.search")
- @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
+ @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectDate}/{state}/{processId}")
public Result selectQualityTesting(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable Integer state,
@PathVariable String processId,
@RequestBody ReportingWork reportingWork){
- return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectTime1,selectTime2,state,processId,reportingWork));
+ return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectDate,state,processId,reportingWork));
}
@@ -192,4 +193,14 @@
public Result saveWorkStorage( @RequestBody Map<String,Object> object){
return Result.seccess(reportingWorkService.saveWorkStorage(object));
- }}
+ }
+
+ @ApiOperation("Mes鎶ュ伐鍩虹鏁版嵁")
+ @PostMapping ("/mesBasicData")
+ public Result mesBasicData() {
+ return Result.seccess(reportingWorkService.mesBasicDataSv());
+ }
+
+}
+
+
--
Gitblit v1.8.0