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/MesMaterialLoadingController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
index 92aa658..24007bb 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
@@ -157,5 +157,25 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesMaterialLoading.class);
}
+ /**
+ * 閫氳繃loadingId鏌ヨ涓嬫枡淇℃伅
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping("/queryUnloadingByLoadingId")
+ public Result<?> queryUnloadingByLoadingId(HttpServletRequest request, HttpServletResponse response) {
+ String loadingId = request.getParameter("loadingId");
+ return Result.OK(mesMaterialLoadingService.queryUnloadingByLoadingId(loadingId));
+ }
+ /*
+ * 閫氳繃 workOrderId 鏌ヨ涓婃枡淇℃伅
+ * @param workOrderId
+ * */
+ @GetMapping("/queryLoadingByWorkOrderId")
+ public Result<?> queryLoadingByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
+ return Result.OK(mesMaterialLoadingService.queryLoadingByWorkOrderId(workOrderId));
+ }
}
--
Gitblit v1.9.3