From 1192076b6eca2e4d96bc0647b8e9e76819e29612 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 31 一月 2023 14:36:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
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 2a294f6..c81e106 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -304,11 +304,20 @@
case 104:
case 108:
staNo = 103;
-
+ BasDevp basDevp1 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
+ .eq("dev_no", 104).or().eq("dev_no", 108).or().eq("dev_no", 109).eq("loading", "Y"));
+ if (!Cools.isEmpty(basDevp1)){
+ continue;
+ }
break;
case 204:
case 208:
staNo = 203;
+ BasDevp basDevp2 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
+ .eq("dev_no", 204).or().eq("dev_no", 208).or().eq("dev_no", 209).eq("loading", "Y"));
+ if (!Cools.isEmpty(basDevp2)){
+ continue;
+ }
break;
default:
News.error("{}浠诲姟鍐嶅叆搴撳け璐ワ紝绯荤粺鏁版嵁寮傚父锛�", wrkMast.getWrkNo());
--
Gitblit v1.9.1