From 6ba196d837ccf9c824b23fd2940b0ef9fc4924fa Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 八月 2023 16:41:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 1ae4d6b..936ebe1 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
@@ -94,7 +95,16 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ List<OrderDetl> orderDetls1 = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls){
+ double v = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ double v1 = new BigDecimal(v).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ if (v1!=0.0){
+ orderDetls1.add(orderDetl);
+ }
+ }
+ return R.ok().add(orderDetls1);
}
@RequestMapping(value = "/order/form/add/auth")
@@ -442,6 +452,8 @@
List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
for (OrderDetl o: orderDetl1) {
o.setAnfme(o.getAnfme()-o.getWorkQty());
+ BigDecimal c1 = new BigDecimal(o.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ o.setAnfme(c1.doubleValue());
orderDetls.add(o);
}
return R.ok(orderDetls);
--
Gitblit v1.9.1