From ef80475ef6f2b80274a0885847dc1bbed0c5cff2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 三月 2025 14:14:58 +0800
Subject: [PATCH] 大屏库位利用率计算方式修改
---
src/main/java/com/zy/asrs/controller/OpenController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5576b9c..9506aae 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,19 +1,27 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -34,12 +42,18 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ConfigService configService;
+
+ @Autowired
+ private LocMastService locMastService;
+
@Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) AgvGroupingParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) AgvGroupingParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param.getOrderNo())) {
param.setOrderNo(param.getBillNo());
@@ -57,14 +71,14 @@
@PostMapping("/barcodeVerificatio")
@AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String,String> param,
- HttpServletRequest request){
+ @RequestBody(required = false) Map<String, String> param,
+ HttpServletRequest request) {
auth(appkey, param, request);
// 鎵樼洏鏉＄爜
String barcode = param.get("barcode");
if (Cools.isEmpty(barcode)) {
- return R.parse("鏉＄爜涓嶈兘涓虹┖");
+ return R.parse("鏉＄爜涓嶈兘涓虹┖");
}
return openService.barcodeVerificatio(barcode);
@@ -73,10 +87,14 @@
@PostMapping("/outbound")
@AppAuth(memo = "MES璋冪敤鍑哄簱")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OutBoundParam param,
- HttpServletRequest request) {
+ @RequestBody(required = false) OutBoundParam param,
+ HttpServletRequest request) {
+ Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
+ if (mesAuto != null && mesAuto.getValue().equals("0")) {
+ return R.parse("鍏抽棴鑷姩鍑哄簱");
+ }
auth(appkey, param, request);
- if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
+ if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) {
return R.parse(BaseRes.PARAM);
}
@@ -87,7 +105,7 @@
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -201,6 +219,28 @@
return R.ok().add(openService.queryStock());
}
+
+ /**
+ * 杩斿洖搴撳瓨鍒╃敤鐜�
+ */
+ @Synchronized
+ @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 - 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);
+ }
+
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
--
Gitblit v1.9.1