From 346d463346701e8714b3a3a3ebb21e21960b5484 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 15:06:47 +0800
Subject: [PATCH] feat: 查看生产订单对应的生产计划来源
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 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 658b40a..8592f25 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -1,13 +1,13 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductOrderDto;
-import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.dto.ProductOrderSourceDto;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductOrderService;
import io.swagger.annotations.Api;
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -28,8 +28,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 +45,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 +75,17 @@
}
+ @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ @PostMapping("addProductOrder")
+ public R addProductOrder(@RequestBody ProductOrder productOrder) {
+ return R.ok(productOrderService.addProductOrder(productOrder));
+ }
+
+ @GetMapping("/productOrderSource/{orderId}")
+ @ApiOperation("鏌ョ湅鐢熶骇璁㈠崟瀵瑰簲鐨勭敓浜ц鍒�")
+ public AjaxResult productOrderSource(@PathVariable Long orderId) {
+ List<ProductOrderSourceDto> list = productOrderService.productOrderSource(orderId);
+ return AjaxResult.success(list);
+ }
+
}
--
Gitblit v1.9.3