From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 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 e2c23ab..31fa3f5 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOperationTaskController.java
@@ -1,23 +1,18 @@
 package com.ruoyi.production.controller;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 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.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;
 
@@ -47,28 +42,52 @@
         return R.ok(productionOperationTaskService.getProductionOperationTaskInfo(id));
     }
 
+    @Log(title = "鏂板宸ュ崟", businessType = BusinessType.INSERT)
     @PostMapping
     @Operation(summary = "鏂板宸ュ崟")
     public R<Boolean> add(@RequestBody ProductionOperationTask productionOperationTask) {
         return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
     }
 
+    @Log(title = "淇敼宸ュ崟", businessType = BusinessType.UPDATE)
     @PutMapping
     @Operation(summary = "淇敼宸ュ崟")
     public R<Boolean> edit(@RequestBody ProductionOperationTask productionOperationTask) {
         return R.ok(productionOperationTaskService.saveProductionOperationTask(productionOperationTask));
     }
 
+    @Log(title = "鍒犻櫎宸ュ崟", businessType = BusinessType.DELETE)
     @DeleteMapping("/delete")
     @Operation(summary = "鍒犻櫎宸ュ崟")
     public R<Boolean> remove(@RequestBody List<Long> ids) {
         return R.ok(productionOperationTaskService.removeProductionOperationTask(ids));
     }
 
+    @Log(title = "浜у搧宸ュ崟鏇存柊", businessType = BusinessType.UPDATE)
     @Operation(summary = "浜у搧宸ュ崟鏇存柊")
     @PostMapping("/updateProductWorkOrder")
     public R updateProductWorkOrder(@RequestBody ProductionOperationTaskDto dto) {
         return R.ok(productionOperationTaskService.updateProductWorkOrder(dto));
     }
 
+    @Log(title = "鎸囨淳鎶ュ伐浜�", businessType = BusinessType.UPDATE)
+    @Operation(summary = "鎸囨淳鎶ュ伐浜�")
+    @PostMapping("/assign")
+    public R<Boolean> assign(@RequestBody ProductionOperationTaskDto dto) {
+        return R.ok(productionOperationTaskService.assign(dto));
+    }
+
+    @Log(title = "宸ュ崟娴佽浆鍗′笅杞�", businessType = BusinessType.EXPORT)
+    @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