From b050b0ef27649165992c264f63042d339d86a4f3 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 03 二月 2026 16:22:10 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 6aafecc..c0730c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -728,7 +728,11 @@
if (offer) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
Date now = new Date();
- taskWrk.setStatus(TaskStatusType.OVER3.id);
+ if (taskWrk.getTargetPoint().equals(staProtocol.getSiteId().toString())){
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ } else {
+ taskWrk.setStatus(TaskStatusType.OVER3.id);
+ }
taskWrk.setWrkSts(14);
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
@@ -2488,14 +2492,21 @@
}
long endP = 0;
+ long endP1 = 0;
+ long endP2 = 0;
ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
- boolean sign = true;
for (TaskProtocol taskProtocol : allTaskProtocol.values()){
if (taskProtocol.getTaskStatus() == 2){//鍙�
- endP = taskProtocol.getTargetPosition();
- sign = false;
- } else if (taskProtocol.getTaskStatus() == 3 && sign){//鏀�
- endP = taskProtocol.getTargetPosition();
+ endP1 = taskProtocol.getTargetPosition();
+ } else if (taskProtocol.getTaskStatus() == 3){//鏀�
+ endP2 = taskProtocol.getTargetPosition();
+ }
+ }
+ if (endP1 > endP2){
+ if (itSmall){
+ endP = endP1;
+ } else {
+ endP = endP2;
}
}
if (endP == 0){
--
Gitblit v1.9.1