From eaf6548902e9472fc9b876d531db8508e16c4f2f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 13:49:43 +0800
Subject: [PATCH] feat: 生产订单的撤回、删除；BOM的子集新增/修改统一使用临时ID处理
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index e1c22d1..0bfbfec 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -19,7 +19,7 @@
import java.math.BigDecimal;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -29,8 +29,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
- @GetMapping("page")
- public R page(ProductOrderDto productOrder, Page page) {
+ @GetMapping("/page")
+ public R page(ProductOrderDto productOrder, Page<ProductOrder> page) {
return R.ok(productOrderService.pageProductOrder(page, productOrder));
}
@@ -44,6 +44,18 @@
@GetMapping("/listProcessRoute")
public R listProcessRoute(Long productModelId) {
return R.ok(productOrderService.listProcessRoute(productModelId));
+ }
+
+ @PostMapping("/revoke")
+ @ApiOperation("鎾ゅ洖鐢熶骇璁″垝")
+ public R revoke(@RequestBody List<Long> ids) {
+ return R.ok(productOrderService.revoke(ids));
+ }
+
+ @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟")
+ @DeleteMapping("/{id}")
+ public R delete(@PathVariable("id") Long ids) {
+ return R.ok(productOrderService.delete(ids));
}
/**
@@ -70,9 +82,5 @@
return R.ok(productOrderService.addProductOrder(productOrder));
}
- @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟")
- @DeleteMapping("/{ids}")
- public R delete(@PathVariable("ids") Long[] ids) {
- return R.ok(productOrderService.delete(ids));
- }
+
}
--
Gitblit v1.9.3