From aa21112291b04d0d3d53d75104a348f019f935a1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 09:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
index 4bc5994..ce84de8 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
@@ -22,7 +22,7 @@
List<BasAgv> idleAgvs = this.selectList(new EntityWrapper<BasAgv>()
.eq("in_enable", "Y")
.eq("is_user", 1)
- .eq("status", 6)
+ .in("status", 6, 8 ,12)
);
if (Cools.isEmpty(idleAgvs)) {
log.warn("娌℃湁绌洪棽鐨凙gv灏忚溅");
@@ -47,8 +47,33 @@
return workNo;
}
+ @Override
+ public String getEmptyAgvWorkNo() {
+ String workNo = null;
+ for (int i = 0; i < 10; i++) {
+ workNo = getEmptyRandom();
+ int count = this.selectCount(new EntityWrapper<BasAgv>().eq("task_code", workNo));
+ if (count == 0) {
+ break;
+ }
+ }
+ if (Cools.isEmpty(workNo)) {
+ throw new CoolException("涓嬪彂AGV浠诲姟閿欒锛屽伐浣滃彿寮傚父");
+ }
+ return workNo;
+ }
+
+
private String getRandom() {
- return String.format("%04d",new Random().nextInt(9999));
+ return String.format("%04d",new Random().nextInt(6000));
+ }
+
+ public String getEmptyRandom(){
+ int min = 6001;
+ int max = 9999;
+ Random random = new Random();
+ int s = random.nextInt(max) % (max - min + 1) + min;
+ return String.format("%04d", s);
}
}
--
Gitblit v1.9.1