From 1a3f5db043fd381b60a0a5f40687136274a2cbd1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 二月 2026 09:57:41 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New' into dev_New_kthg
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 27 +--------------------------
1 files changed, 1 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..09bd010 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -1,13 +1,11 @@
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;
@@ -19,7 +17,7 @@
import java.math.BigDecimal;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -53,29 +51,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