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/MesKittingCompletenessCheckController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java b/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
index ed5d68f..76a6361 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -19,6 +20,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 榻愬鎬ф鏌ヨ褰�
@@ -28,7 +31,7 @@
*/
@Api(tags="榻愬鎬ф鏌ヨ褰�")
@RestController
-@RequestMapping("/meskittingcompletenesscheck/mesKittingCompletenessCheck")
+@RequestMapping("/mes/mesKittingCompletenessCheck")
@Slf4j
public class MesKittingCompletenessCheckController extends JeecgController<MesKittingCompletenessCheck, IMesKittingCompletenessCheckService> {
@Autowired
@@ -50,9 +53,10 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<MesKittingCompletenessCheck> queryWrapper = QueryGenerator.initQueryWrapper(mesKittingCompletenessCheck, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<MesKittingCompletenessCheck> queryWrapper = QueryGenerator.initQueryWrapper(mesKittingCompletenessCheck, parameterMap);
Page<MesKittingCompletenessCheck> page = new Page<MesKittingCompletenessCheck>(pageNo, pageSize);
- IPage<MesKittingCompletenessCheck> pageList = mesKittingCompletenessCheckService.page(page, queryWrapper);
+ IPage<MesKittingCompletenessCheck> pageList = mesKittingCompletenessCheckService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
@@ -69,6 +73,15 @@
public Result<String> add(@RequestBody MesKittingCompletenessCheck mesKittingCompletenessCheck) {
mesKittingCompletenessCheckService.save(mesKittingCompletenessCheck);
return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "榻愬鎬ф鏌ヨ褰�-鎵归噺娣诲姞")
+ @ApiOperation(value="榻愬鎬ф鏌ヨ褰�-鎵归噺娣诲姞", notes="榻愬鎬ф鏌ヨ褰�-鎵归噺娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:mes_kitting_completeness_check:addBatch")
+ @PostMapping(value = "/addBatch")
+ public Result<String> addBatch(@RequestBody List<MesKittingCompletenessCheck> mesKittingCompletenessCheckList) {
+ mesKittingCompletenessCheckService.batchSave(mesKittingCompletenessCheckList);
+ return Result.OK("鎵归噺娣诲姞鎴愬姛锛�");
}
/**
@@ -157,5 +170,12 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MesKittingCompletenessCheck.class);
}
-
+ /*
+ * 閫氳繃 workOrderId 鏌ヨ榻愬淇℃伅
+ * @param workOrderId
+ * */
+ @GetMapping("/queryCompletenessCheckByWorkOrderId")
+ public Result<?> queryCompletenessCheckByWorkOrderId(@RequestParam(name = "workOrderId", required = true) String workOrderId) {
+ return Result.OK(mesKittingCompletenessCheckService.queryCompletenessCheckByWorkOrderId(workOrderId));
+ }
}
--
Gitblit v1.9.3