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 | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 658b40a..0bfbfec 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -16,9 +16,10 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -28,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));
}
@@ -45,15 +46,26 @@
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));
+ }
+
/**
* 瀵煎嚭鐢熶骇璁㈠崟
*/
@Log(title = "鐢熶骇璁㈠崟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProductOrderDto productOrderDto) {
- List<ProductOrderDto> list;
- list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
- ExcelUtil<ProductOrderDto> util = new ExcelUtil<ProductOrderDto>(ProductOrderDto.class);
+ List<ProductOrderDto> list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
+ ExcelUtil<ProductOrderDto> util = new ExcelUtil<>(ProductOrderDto.class);
util.exportExcel(response, list, "鐢熶骇璁㈠崟鏁版嵁");
}
@@ -64,4 +76,11 @@
}
+ @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ @PostMapping("addProductOrder")
+ public R addProductOrder(@RequestBody ProductOrder productOrder) {
+ return R.ok(productOrderService.addProductOrder(productOrder));
+ }
+
+
}
--
Gitblit v1.9.3