From 07dad0e9ef89346439cfcfb5978b0f1cb8f1b512 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 27 五月 2025 12:31:30 +0800
Subject: [PATCH] 新增PDA并板操作
---
src/main/java/com/zy/asrs/controller/OpenController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f7b2f36..9506aae 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;
@@ -225,16 +224,19 @@
* 杩斿洖搴撳瓨鍒╃敤鐜�
*/
@Synchronized
- @PostMapping("/stock/userd/v1")
+ @PostMapping("/stock/used/v1")
public R getRate(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
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);
- BigDecimal divisor = new BigDecimal(i1 - i);
- BigDecimal quotient = dividend.divide(divisor);
+// 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(1200 - i)
+ .divide(BigDecimal.valueOf(1200), 4, RoundingMode.HALF_UP);
return R.ok().add(quotient);
}
--
Gitblit v1.9.1