From 3bfcf868d9c4537b3fdc066260b6ed124e864adb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 九月 2023 08:07:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 0a9657f..e1ec863 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -95,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")
@@ -160,14 +169,7 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- if (Cools.isEmpty(orderDetl.getOwner())){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
- }else {
- LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
- if (Cools.isEmpty(locOwner)){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
- }
- }
+
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
@@ -188,9 +190,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- if(orderDetl.getPayment() == null){
- orderDetl.setPayment(1);
- }
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
--
Gitblit v1.9.1