From 92d8d06d8ae38c407715a5e9389691b446413e0a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 10:06:09 +0800
Subject: [PATCH] yys 1.生产逻辑修改
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 978e9b3..48f39e9 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -16,9 +16,11 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -31,6 +33,12 @@
@GetMapping("page")
public R page(ProductOrderDto productOrder, Page page) {
return R.ok(productOrderService.pageProductOrder(page, productOrder));
+ }
+
+ @ApiOperation("宸ュ崟寮�濮嬪拰鏆傚仠")
+ @PostMapping("/startOrPause")
+ public R startOrPause(@RequestBody ProductOrderDto productOrder) {
+ return R.ok(productOrderService.startOrPause(productOrder));
}
@ApiOperation("缁戝畾宸ヨ壓璺嚎")
@@ -51,10 +59,50 @@
@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();
+
+ 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, "鐢熶骇璁㈠崟鏁版嵁");
}
+ @ApiOperation("鏌ヨ鐢熶骇璁㈠崟瀵瑰簲鐨凚OM")
+ @GetMapping("/listProcessBom")
+ public R listProcessBom(Long orderId) {
+ return R.ok(productOrderService.listProcessBom(orderId));
+ }
+
+
+ @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ @PostMapping("/addProductOrder")
+ public R addProductOrder(@RequestBody ProductOrder productOrder) throws IOException {
+ 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