From 741918a903e17b2ec7522556d2c043b8d35dd8a1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 17:42:58 +0800
Subject: [PATCH] 生产取消bom,不合格管理定制化
---
src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index af6184a..6d88dba 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
@@ -24,14 +25,24 @@
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
- return R.ok(productionOperationTaskService.pageProductionOperationTask(page, dto));
+ public R page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto,
+ @RequestParam(required = false) Boolean filterMine) {
+ Long currentUserId = null;
+ if (Boolean.TRUE.equals(filterMine)) {
+ currentUserId = SecurityUtils.getUserId();
+ }
+ return R.ok(productionOperationTaskService.pageProductionOperationTask(page, dto, currentUserId));
}
@GetMapping("/list")
@Operation(summary = "宸ュ崟鍒楄〃")
- public R<List<ProductionOperationTaskVo>> list(ProductionOperationTaskDto dto) {
- return R.ok(productionOperationTaskService.listProductionOperationTask(dto));
+ public R<List<ProductionOperationTaskVo>> list(ProductionOperationTaskDto dto,
+ @RequestParam(required = false) Boolean filterMine) {
+ Long currentUserId = null;
+ if (Boolean.TRUE.equals(filterMine)) {
+ currentUserId = SecurityUtils.getUserId();
+ }
+ return R.ok(productionOperationTaskService.listProductionOperationTask(dto, currentUserId));
}
@GetMapping("/{id}")
@@ -70,14 +81,16 @@
return R.ok(productionOperationTaskService.assign(dto));
}
- /**
- * 宸ュ崟娴佽浆鍗′笅杞�
- * @param response
- * @param dto
- */
@PostMapping("/down")
+ @Operation(summary = "宸ュ崟娴佽浆鍗′笅杞�")
public void down(HttpServletResponse response, @RequestBody ProductionOperationTaskDto dto) {
productionOperationTaskService.down(response, dto);
}
+ @GetMapping("/getOperation")
+ @Operation(summary = "宸ュ簭璇︽儏鏌ヨ")
+ public R<List<ProductionOperationTaskVo>> getOperation(ProductionOperationTaskDto dto) {
+ return R.ok(productionOperationTaskService.getOperation(dto));
+ }
+
}
--
Gitblit v1.9.3