From 4b794ae3434815a03cea919eaee5f05d39a99480 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 三月 2025 14:08:54 +0800
Subject: [PATCH] 大屏库位利用率计算方式修改
---
src/main/java/com/zy/asrs/controller/OpenController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6cdf87b..7e10d7d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -9,7 +9,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
@@ -22,8 +21,8 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -231,10 +230,13 @@
HttpServletRequest request) {
auth(appkey, param, request);
int i = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", "O"));
- int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", Arrays.asList("D", "F", "P", "Q", "R", "S")));
- BigDecimal dividend = new BigDecimal(i1 - i);
- BigDecimal divisor = new BigDecimal(i1);
- BigDecimal quotient = dividend.divide(divisor,4, BigDecimal.ROUND_HALF_UP);
+// int i1 = locMastService.selectCount(new EntityWrapper<LocMast>().in("loc_sts", Arrays.asList("D", "F", "P", "Q", "R", "S")));
+// BigDecimal dividend = new BigDecimal(i1 - i);
+// BigDecimal divisor = new BigDecimal(i1);
+// BigDecimal quotient = dividend.divide(divisor,4, BigDecimal.ROUND_HALF_UP);
+ // 鍦ㄥ簱鐜�=(鎬绘暟-绌哄簱浣嶆暟)/鎬绘暟
+ BigDecimal quotient = BigDecimal.valueOf(12000 - i)
+ .divide(BigDecimal.valueOf(12000), 4, RoundingMode.HALF_UP);
return R.ok().add(quotient);
}
--
Gitblit v1.9.1