From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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..7d548a8 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,6 +83,7 @@
@RequestBody ReportingWork reportingWork){
return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectTime1,selectTime2,orderId,reportingWork));
+
}
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
@@ -109,6 +110,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 +177,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