From 85113dabc3d7243dc98d0e25bee88f5f106f9e28 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 02 五月 2024 15:02:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 7ab6d4e..d7ffaff 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -253,6 +253,7 @@
}
String origin = null;
boolean sign = false;
+ boolean sign101 = false;
if (wrkMast.getIoType()!=101){
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
@@ -270,6 +271,8 @@
log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
continue;
}
+ }else {
+ sign101 = true;
}
int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
if (count!=0){
@@ -297,7 +300,7 @@
for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
if (staNoOther.equals(wrkMastStaNo)) continue;
- if (sign){
+ if (sign && !sign101){
if (Cools.isEmpty(origin)){
continue;
}
--
Gitblit v1.9.1