From 22b57a30be7f73e13585ae4bd4925f0c66846ba9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 11 六月 2026 14:52:57 +0800
Subject: [PATCH] feat(production): 优化工单查询接口按订单维度分组并新增订单明细查询
---
src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index 52a4357..de2b9e1 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -1,22 +1,17 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.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;
@@ -29,9 +24,15 @@
private final ProductionOperationTaskService productionOperationTaskService;
@GetMapping("/page")
- @Operation(summary = "鍒嗛〉鏌ヨ")
- public R page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
+ @Operation(summary = "宸ュ崟鍒嗛〉鏌ヨ", description = "鎸夌敓浜ц鍗曠淮搴﹀垎缁勫睍绀猴紝杩斿洖璁㈠崟绾у埆鐨勬眹鎬绘暟鎹�")
+ public R<IPage<ProductionOperationTaskVo>> page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
return R.ok(productionOperationTaskService.pageProductionOperationTask(page, dto));
+ }
+
+ @GetMapping("/byOrder/{orderId}")
+ @Operation(summary = "鏍规嵁璁㈠崟ID鏌ヨ宸ュ崟鍒楄〃", description = "鏌ヨ鎸囧畾鐢熶骇璁㈠崟涓嬬殑鎵�鏈夊伐鍗曟槑缁�")
+ public R<List<ProductionOperationTaskVo>> byOrder(@PathVariable Long orderId) {
+ return R.ok(productionOperationTaskService.listByOrderId(orderId));
}
@GetMapping("/list")
@@ -63,4 +64,29 @@
public R<Boolean> remove(@RequestBody List<Long> ids) {
return R.ok(productionOperationTaskService.removeProductionOperationTask(ids));
}
+
+ @Operation(summary = "浜у搧宸ュ崟鏇存柊")
+ @PostMapping("/updateProductWorkOrder")
+ public R updateProductWorkOrder(@RequestBody ProductionOperationTaskDto dto) {
+ 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