From a19c350a3f55762dc93246b024c3cf2ff852bded Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 15 三月 2023 10:49:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 6bee175..34b993d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -729,7 +729,7 @@
wrkMasts.add(wrkMast);
count++;
if(count==0) continue;
- if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime())
+ if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime() && wrkMast.getIoPri()<wrkMasts.get(i).getIoPri())
i=count;
crnStn1=crnStn;
}
@@ -966,12 +966,7 @@
public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
//鎸夌収宸ヤ綔妗ｅ嚭搴�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no", slave.getId())
- .and()
- .gt("io_type", 100)
- .orderBy("appe_time")
- );
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkIoType(slave.getId());
if (!Cools.isEmpty(wrkMasts)) {
for (WrkMast wrkMast : wrkMasts) {
CrnSlave.CrnStn crnStn = null;
--
Gitblit v1.9.1