From 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index a33a046..31608f0 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -50,11 +50,13 @@
.andNew().eq("io_type",53)
.or().eq("io_type",1)
.or().eq("io_type",57)
+ .or().eq("io_type",58)
.or().eq("io_type",10)
.or().eq("io_type",11)
.or().eq("io_type",12)
.or().eq("io_type",108)
- .or().eq("io_type",109));
+ .or().eq("io_type",109)
+ .or().eq("io_type",112));
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.stream().forEach(agvWrkMast -> {
agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
@@ -77,6 +79,7 @@
});
}
}
+
/*
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
@@ -108,15 +111,39 @@
.or().eq("io_type", 1)
.or().eq("io_type", 10)
.or().eq("io_type", 57)
+ .or().eq("io_type", 58)
.or().eq("io_type", 11)
.or().eq("io_type", 12)
.or().eq("io_type", 109)
- .or().eq("io_type", 108)).getRecords();
+ .or().eq("io_type", 108)
+ .or().eq("io_type", 112)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.forEach(agvWrkMast -> {
try {
agvWrkMastHandler.startPutWayWrk(agvWrkMast);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ });
+ }
+ }
+
+ /*
+ putaway锛氫笂鏋�
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void startAllcationIn(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
+ ,new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 211)
+ .andNew().eq("io_type", 112)).getRecords();
+
+ if(!Cools.isEmpty(agvWrkMastList)){
+ agvWrkMastList.forEach(agvWrkMast -> {
+ try {
+ agvWrkMastHandler.startAllcationIn(agvWrkMast);
} catch (IOException e) {
log.error(e.getMessage());
}
@@ -138,7 +165,9 @@
.or().eq("io_type", 103)
.or().eq("io_type", 11)
.or().eq("io_type", 110)
- .or().eq("io_type", 107)).getRecords();
+ .or().eq("io_type", 107)
+ .or().eq("io_type", 109)
+ .or().eq("io_type", 108)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
List<String> devNos = new ArrayList<>();
@@ -159,6 +188,14 @@
if(!Cools.isEmpty(agvWrkMastWorking)){
return;
}
+
+ agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+ .eq("source_loc_no",agvWrkMast.getLocNo())
+ .le("wrk_sts",204L));
+
+ if(!Cools.isEmpty(agvWrkMastWorking)){
+ return;
+ }
agvWrkMastHandler.startPutWayWrk(agvWrkMast);
} catch (IOException e) {
--
Gitblit v1.9.1