From fd89fbfa59d40f4016b43bcac8286bdcdb5e4df9 Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 13:22:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 ea96099..0f800d3 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
@@ -83,14 +83,17 @@
@RequestBody ReportingWork reportingWork){
return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+
}
@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));
@@ -109,6 +112,13 @@
@RequestBody ReportingWork reportingWork){
return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectTime1,selectTime2,state,processId,reportingWork));
+ }
+
+ @ApiOperation("APP璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("qualityInspectionReview.search")
+ @PostMapping ("qualityReviewSearch")
+ public Result qualityReviewSearch(){
+ return Result.seccess(reportingWorkService.qualityReviewSearchSv());
}
@ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
@@ -169,4 +179,19 @@
return Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
}
-}
+ @ApiOperation("鎵嬫満鏌ヨ鏈彮缁勬姤宸ヨ褰�")
+ @PostMapping("/selectReportingWorkRecordByPhone")
+ public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam) {
+ return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
+ }
+
+@ApiOperation("鎵嬫満鏌ヨ鏈伐搴忚澶�")
+ @PostMapping("/selectEquipmentByProcess/{process}")
+ public Result selectEquipmentByProcess(@PathVariable String process) {
+ return Result.seccess(reportingWorkService.selectEquipmentByProcessSv(process));
+ }@ApiOperation("鎶ュ伐鍏ュ簱鎺ュ彛")
+ @PostMapping("/saveWorkStorage")
+ public Result saveWorkStorage( @RequestBody Map<String,Object> object){
+ return Result.seccess(reportingWorkService.saveWorkStorage(object));
+
+ }}
--
Gitblit v1.8.0