From b864a88a6d34cbed2cfaad7f5e843ea1330c9c91 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 10:31:33 +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 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 17c0a89..c12c0a3 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
@@ -26,6 +26,7 @@
}
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
+ @SaCheckPermission("AddReportingWork.search")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -130,4 +131,17 @@
return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
}
+
+ @ApiOperation("琛ョ墖鐘舵�佹煡璇�")
+ @PostMapping ("/getPatchCondition/{reportingWorkId}")
+ public Result getPatchCondition(
+ @PathVariable String reportingWorkId) {
+ return Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
+ }
+
+ @ApiOperation("鎶ュ伐鏂板鏃ュ織")
+ @PostMapping ("/saveReportingWorkLog")
+ public Result saveReportingWorkLog(@RequestBody Map<String,Object> reportingWork) {
+ return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
+ }
}
--
Gitblit v1.8.0