From ad9e0b39af5e449f037b716d7416b9e9e559dce6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 09 四月 2025 08:15:32 +0800
Subject: [PATCH] #限制盘点数量
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++++
src/main/java/com/zy/asrs/controller/MonitorController.java | 4 ++--
src/main/resources/application.yml | 2 ++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 51cfa78..20f244d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -230,13 +230,13 @@
// 浣跨敤涓�
Integer used = locUseRate.getFqty() + locUseRate.getUqty();
// 搴撲綅浣跨敤鐜�
- double usedDivides = Arith.divides(3, used, 11200);
+ double usedDivides = Arith.divides(3, used, total);
double usedPr = Arith.multiplys(1, usedDivides, 100);
return R.ok(
Cools.add("pie", pie)
.add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", 11200-used)
+ .add("emptyCount", locUseRate.getOqty())
.add("noneCount", locUseRate.getXqty())
.add("total", total)
.add("used", used)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 99400fb..0d27fcc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -97,6 +97,8 @@
@Value("${wms.url}")
private String wmsUrl;
+ @Value("${inventory.number}")
+ private Integer inventoryNumber;
public Integer wrkNo = 10000;
@@ -1076,6 +1078,12 @@
if (wrkMast == null) {
continue;
}
+ if (wrkMast.getIoType() == 107){
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", wrkMast.getIoType()).eq("wrk_sts", 14));
+ if (count >= inventoryNumber) {
+ continue;
+ }
+ }
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
News.error(""+mark+" - 2"+" - 1"+" - 鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 249dbe0..4629c92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,6 +35,8 @@
wms:
url: 127.0.0.1:9090/ykwms
+inventory:
+ number: 7
# 涓嬩綅鏈洪厤缃�
wcs-slave:
--
Gitblit v1.9.1