From 285fa628a51ccc480ee946d2a1ee5bd13e9ae65a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 13:51:58 +0800
Subject: [PATCH] fix: 工艺路线子集SQL去除产品查询
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 4cb0c68..fd32aeb 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));
}
@@ -46,6 +46,12 @@
return R.ok(productOrderService.listProcessRoute(productModelId));
}
+ @PostMapping("/revoke")
+ @ApiOperation("鎾ゅ洖鐢熶骇璁″垝")
+ public R revoke(@RequestBody ProductOrder productOrder) {
+ return R.ok(productOrderService.revoke(productOrder));
+ }
+
/**
* 瀵煎嚭鐢熶骇璁㈠崟
*/
@@ -53,29 +59,6 @@
@PostMapping("/export")
public void export(HttpServletResponse response, ProductOrderDto productOrderDto) {
List<ProductOrderDto> list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
-
- if (list != null && !list.isEmpty()) {
- list.forEach(item -> {
- // 鍒ょ┖
- if (item.getQuantity() == null || item.getCompleteQuantity() == null) {
- item.setCompletionStatus(BigDecimal.ZERO);
- return;
- }
-
- // 鍒ら浂
- if (item.getQuantity().compareTo(BigDecimal.ZERO) == 0) {
- item.setCompletionStatus(BigDecimal.ZERO);
- return;
- }
- BigDecimal progress = item.getCompleteQuantity()
- .divide(item.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)
- .multiply(new BigDecimal(100))
- .setScale(2, BigDecimal.ROUND_HALF_UP);
-
- item.setCompletionStatus(progress);
- });
- }
-
ExcelUtil<ProductOrderDto> util = new ExcelUtil<>(ProductOrderDto.class);
util.exportExcel(response, list, "鐢熶骇璁㈠崟鏁版嵁");
}
--
Gitblit v1.9.3