From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
index a55d476..cc373c6 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 宸ュ崟鎶ュ伐
@@ -62,12 +63,12 @@
* @param mesWorkReporting
* @return
*/
- @AutoLog(value = "宸ュ崟鎶ュ伐-娣诲姞")
- @ApiOperation(value="宸ュ崟鎶ュ伐-娣诲姞", notes="宸ュ崟鎶ュ伐-娣诲姞")
+ @AutoLog(value = "宸ュ崟鎶ュ伐-鏂板鎶ュ伐")
+ @ApiOperation(value="宸ュ崟鎶ュ伐-鏂板鎶ュ伐", notes="宸ュ崟鎶ュ伐-鏂板鎶ュ伐")
//@RequiresPermissions("org.jeecg.modules:mes_work_reporting:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody MesWorkReporting mesWorkReporting) {
- mesWorkReportingService.save(mesWorkReporting);
+ mesWorkReportingService.addReporting(mesWorkReporting);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -157,5 +158,22 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesWorkReporting.class);
}
+ /**
+ * 鏍规嵁workOrderId鏌ヨ 鎶ュ伐
+ *
+ * @param workOrderId
+ * @return
+ *
+ */
+ @GetMapping(value = "/queryWorkReportingByWorkOrderId")
+ public Result<?> queryWorkReportingByWorkOrderId(@RequestParam("workOrderId") String workOrderId){
+ List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByWorkOrderId(workOrderId);
+ return Result.OK(mesWorkReportings);
+ }
+ @GetMapping(value = "/queryWorkReportingByOrderId")
+ public Result<?> queryWorkReportingByOrderId(@RequestParam("orderId") String orderId){
+ List<MesWorkReporting> mesWorkReportings = mesWorkReportingService.queryWorkReportingByOrderId(orderId);
+ return Result.OK(mesWorkReportings);
+ }
}
--
Gitblit v1.9.3