From 15c8f00ab3a1e3d2d96b56bae0ec11efedd60231 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 29 九月 2021 11:14:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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..7afc456 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
@@ -22,13 +22,27 @@
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灏忚溅");
throw new CoolException("娌℃湁绌洪棽鐨凙gv灏忚溅");
}
return idleAgvs.get(0);
+ }
+
+ @Override
+ public Boolean haveIdleAgv() {
+ List<BasAgv> idleAgvs = this.selectList(new EntityWrapper<BasAgv>()
+ .eq("in_enable", "Y")
+ .eq("is_user", 1)
+ .in("status", 6, 8 ,12)
+ );
+ if (Cools.isEmpty(idleAgvs)) {
+ log.warn("娌℃湁绌洪棽鐨凙gv灏忚溅");
+ return false;
+ }
+ return true;
}
@Override
@@ -47,8 +61,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("%06d",new Random().nextInt(700000));
+ }
+
+ public String getEmptyRandom(){
+ int min = 700001;
+ int max = 999999;
+ Random random = new Random();
+ int s = random.nextInt(max) % (max - min + 1) + min;
+ return String.format("%06d", s);
}
}
--
Gitblit v1.9.1