From 0d663103c178d04f725fb0ef3a4ce2fa454b9244 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 7 ++++++-
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index cad09df..9d41995 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -37,7 +37,7 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000){
+ if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
continue;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
index d874084..9a9c3bc 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -73,7 +73,12 @@
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
switch ((wrkMast.getStaNo())){
case 1108:wrkMastSta1.setStaEnd(1109);break;
- case 4006:wrkMastSta1.setStaEnd(1018);break;
+ case 4006:
+ if(wrkMastSta1.getStaStart()>2000){
+ wrkMastSta1.setStaEnd(2018);break;
+ }else{
+ wrkMastSta1.setStaEnd(1018);break;
+ }
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
--
Gitblit v1.9.1