From 4660b2e57c53fa6b798c104abbe4a6b0ad4b6a97 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 18:50:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index a7dcc13..5e9d85a 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -135,7 +135,8 @@
.or().eq("io_type", 108)
.or().eq("io_type", 111)
.or().eq("io_type", 112)
- .or().eq("io_type", 113)).getRecords();
+ .or().eq("io_type", 113)
+ .or().eq("io_type", 114)).getRecords();
if(!Cools.isEmpty(agvWrkMastList)){
agvWrkMastList.forEach(agvWrkMast -> {
--
Gitblit v1.9.1