From c04245f2dd95a3c2ef6a4260c6200e4c626fc322 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 五月 2025 08:22:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 6 +++++-
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 7f780de..8ab39f5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -50,7 +50,8 @@
public R getPdaOrderDetl(@RequestBody Map<String,Object> map) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", map.get("orderNo"));
- return R.ok(orderDetlService.selectList(wrapper));
+ List<OrderDetl> orderDetls = orderDetlService.selectList(wrapper);
+ return R.ok(orderDetls);
}
@RequestMapping(value = "/orderDetl/{id}/auth")
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index a7b0338..442cdb2 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -15,6 +15,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -453,7 +454,10 @@
public Double getEnableQty() {
if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+
+ BigDecimal subtract = new BigDecimal(this.anfme).subtract(new BigDecimal(this.workQty));
+
+ return subtract.doubleValue();
}
// if (null != this.anfme && this.qty != null) {
// return this.anfme - this.qty;
--
Gitblit v1.9.1