From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
index 339ab7d..029e457 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.pojo.QualityInspect;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
@RestController
@AllArgsConstructor
@@ -27,4 +29,32 @@
return R.ok(productWorkOrderservice.listPage(page, productWorkOrder));
}
+ /**
+ * 浜у搧宸ュ崟鏇存柊
+ */
+ @ApiOperation("浜у搧宸ュ崟鏇存柊")
+ @PostMapping ("/updateProductWorkOrder")
+ public R updateProductWorkOrder(@RequestBody ProductWorkOrderDto productWorkOrderDto) {
+ return R.ok(productWorkOrderservice.updateProductWorkOrder(productWorkOrderDto));
+ }
+
+ /**
+ * pda鏍规嵁浜岀淮鐮佺殑宸ュ崟id鏌ヨ鏁版嵁
+ */
+ @ApiOperation("pda鏍规嵁浜岀淮鐮佺殑宸ュ崟id鏌ヨ鏁版嵁")
+ @GetMapping("/getProductWorkOrderById")
+ public R getProductWorkOrderById(Long id) {
+ return R.ok(productWorkOrderservice.getById(id));
+ }
+
+ /**
+ * 宸ュ崟娴佽浆鍗′笅杞�
+ * @param response
+ * @param productWorkOrder
+ */
+ @PostMapping("/down")
+ public void down(HttpServletResponse response, @RequestBody ProductWorkOrder productWorkOrder) {
+ productWorkOrderservice.down(response, productWorkOrder);
+ }
+
}
--
Gitblit v1.9.3