From 7f43845a6289a2ba7c6c1c313501674b59892cb7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 15:00:42 +0800
Subject: [PATCH] 齐套性检查、上下料查询相关接口
---
src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..7740a65 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Map;
/**
* @Description: 涓婃枡
@@ -50,9 +51,10 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MesMaterialLoading> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialLoading, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<MesMaterialLoading> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialLoading, parameterMap);
Page<MesMaterialLoading> page = new Page<MesMaterialLoading>(pageNo, pageSize);
- IPage<MesMaterialLoading> pageList = mesMaterialLoadingService.page(page, queryWrapper);
+ IPage<MesMaterialLoading> pageList = mesMaterialLoadingService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
@@ -157,5 +159,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