From bb78ea38792502cbff36c9a4486b7b12e1940615 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 15a7ca6..4beb89f 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -1,18 +1,27 @@
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.R;
import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductOrderService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.List;
@RequestMapping("productOrder")
@RestController
+@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@Autowired
@@ -25,6 +34,57 @@
return R.ok(productOrderService.pageProductOrder(page, productOrder));
}
+ @ApiOperation("缁戝畾宸ヨ壓璺嚎")
+ @PostMapping("/bindingRoute")
+ public R bindingRoute(@RequestBody ProductOrder productOrder) {
+ return R.ok(productOrderService.bindingRoute(productOrder));
+ }
+
+ @ApiOperation("鏌ヨ瑙勬牸鍨嬪彿瀵瑰簲鐨勫伐鑹鸿矾绾�")
+ @GetMapping("/listProcessRoute")
+ public R listProcessRoute(Long productModelId) {
+ return R.ok(productOrderService.listProcessRoute(productModelId));
+ }
+
+ /**
+ * 瀵煎嚭鐢熶骇璁㈠崟
+ */
+ @Log(title = "鐢熶骇璁㈠崟", businessType = BusinessType.EXPORT)
+ @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, "鐢熶骇璁㈠崟鏁版嵁");
+ }
+
+ @ApiOperation("鏌ヨ鐢熶骇璁㈠崟瀵瑰簲鐨凚OM")
+ @GetMapping("/listProcessBom")
+ public R listProcessBom(Long orderId) {
+ return R.ok(productOrderService.listProcessBom(orderId));
+ }
}
--
Gitblit v1.9.3