From 7b854444d9b272fcaf1abc369e0b8e3871a3c344 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 16 十二月 2023 17:05:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 18d1323..a67de9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -192,7 +192,10 @@
continue;
}
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
- if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() != workNo){
+ if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
+ if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
+ continue;
+ }
//鑾峰彇鍫嗗灈鏈虹珯鐐�
StaDesc staDesc = new StaDesc();
if (devp.getId() <= 1){
@@ -740,11 +743,14 @@
commandInfo = commandInfoService.selectById(commandId);
}
+
if (commandInfo == null) {
//鎸囦护涓嶅瓨鍦�
continue;
}
-
+ if (commandInfo.getCommandStatus() == 3){
+ continue;
+ }
commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
--
Gitblit v1.9.1