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 | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index e2c23ab..6d88dba 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -1,23 +1,17 @@
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;
import com.ruoyi.production.pojo.ProductionOperationTask;
import com.ruoyi.production.service.ProductionOperationTaskService;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -31,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}")
@@ -71,4 +75,22 @@
return R.ok(productionOperationTaskService.updateProductWorkOrder(dto));
}
+ @Operation(summary = "鎸囨淳鎶ュ伐浜�")
+ @PostMapping("/assign")
+ public R<Boolean> assign(@RequestBody ProductionOperationTaskDto dto) {
+ return R.ok(productionOperationTaskService.assign(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