From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 2dfd83b..5807e33 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -202,16 +202,16 @@
// 鍑哄簱绔欑偣
Integer outSite = null;
- List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123));
+ List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123).orderBy("dev_no",false));
for (BasDevp basDevp : devps) {
// 鏃犲伐浣滃彿锛屾棤鐗�
- if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("N")) {
+ if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("Y")) {
outSite = basDevp.getDevNo();
break;
}
}
if (outSite == null) {
- outSite = 123;
+ outSite = 223;
}
Date now = new Date();
--
Gitblit v1.9.1