From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
index 1c9922f..af6184a 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -1,18 +1,83 @@
package com.ruoyi.production.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
-/**
- * <p>
- * 鐢熶骇宸ュ崟琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-21 03:55:52
- */
+import java.util.List;
+
@RestController
@RequestMapping("/productionOperationTask")
+@Tag(name = "鐢熶骇宸ュ崟")
+@RequiredArgsConstructor
public class ProductionOperationTaskController {
+ private final ProductionOperationTaskService productionOperationTaskService;
+
+ @GetMapping("/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R page(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
+ return R.ok(productionOperationTaskService.pageProductionOperationTask(page, dto));
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "宸ュ崟鍒楄〃")
+ public R<List<ProductionOperationTaskVo>> list(ProductionOperationTaskDto dto) {
+ return R.ok(productionOperationTaskService.listProductionOperationTask(dto));
+ }
+
+ @GetMapping("/{id}")
+ @Operation(summary = "宸ュ崟璇︽儏")
+ public R<ProductionOperationTaskVo> getInfo(@PathVariable("id") Long id) {
+ return R.ok(productionOperationTaskService.getProductionOperationTaskInfo(id));
+ }
+
+ @PostMapping
+ @Operation(summary = "鏂板宸ュ崟")
+ public R<Boolean> add(@RequestBody ProductionOperationTask productionOperationTask) {
+ return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
+ }
+
+ @PutMapping
+ @Operation(summary = "淇敼宸ュ崟")
+ public R<Boolean> edit(@RequestBody ProductionOperationTask productionOperationTask) {
+ return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎宸ュ崟")
+ 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));
+ }
+
+ /**
+ * 宸ュ崟娴佽浆鍗′笅杞�
+ * @param response
+ * @param dto
+ */
+ @PostMapping("/down")
+ public void down(HttpServletResponse response, @RequestBody ProductionOperationTaskDto dto) {
+ productionOperationTaskService.down(response, dto);
+ }
+
}
--
Gitblit v1.9.3