From c12e04926ca5d56f324aefa904df4c2aac76a9a8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:25:52 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
1 files changed, 5 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 6aed8dc..19293ef 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -768,7 +768,7 @@
for (TaskWrk taskWrk : taskWrks) {
//鑾峰彇鍛戒护闆嗗悎
List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- if ((taskWrk.getCommandStep() + 1) != commandInfos.size()) {
+ if (taskWrk.getCommandStep() != commandInfos.size()) {
continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
}
@@ -781,6 +781,10 @@
Date now = new Date();
//鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
if (taskWrk.getIoType() == 1) {
+ if (taskWrk.getStartPoint() == null || taskWrk.getTargetPoint() == null) {
+ continue;//鏈帴鏀跺埌璧风偣鍜岀粓鐐癸紝涓嶈繘琛屾淳鍙�
+ }
+
//鍏ュ簱浠诲姟
taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
taskWrk.setStatus(TaskStatusType.COMPLETE.id);
--
Gitblit v1.9.1