From b5e0def6c1356c2fb82c73310389856ffb54c166 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 十月 2025 09:08:31 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 16 ++++++++++++----
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 6 ++++--
src/main/java/com/zy/common/model/LocTypeDto.java | 1 +
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index c07073e..01f6c09 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -31,8 +31,10 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
- continue;
+ if(wrkMast.getIoType() != 11){
+ if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
+ continue;
+ }
}
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 35e2c3a..c36ffdb 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -58,15 +58,15 @@
put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
+ put(1105,1105);put(1104,1105);put(1043,1042);
}};
public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);
-
}};
// 寮傚父鍑哄簱鍙�
public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
- add(1042);add(1105);
+ add(1042);add(1105);add(1104);add(1043);
}};
// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
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 c1d80ba..23110ee 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -28,7 +28,14 @@
public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
try {
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
+ WrkMastSta wrkMastSta = null;
+ if(wrkMast != null){
+ wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
+ }
+ if(basDevp.getWrkNo() != null){
+ wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", basDevp.getWrkNo().longValue()));
+ }
+
if (!Cools.isEmpty(wrkMastSta) ){
return SUCCESS;
}
@@ -64,7 +71,7 @@
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
switch ((wrkMast.getStaNo())){
- case 1108:wrkMastSta1.setStaEnd(1106);break;
+ case 1108:wrkMastSta1.setStaEnd(1109);break;
case 4006:wrkMastSta1.setStaEnd(1018);break;
}
wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
@@ -77,8 +84,9 @@
wrkMast23.setWrkNo(basDevp.getWrkNo());
wrkMast23.setSourceStaNo(basDevp.getDevNo());
wrkMast23.setStaNo(1041);
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
+
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast23,new Date(),basDevp);
+ wrkMastSta1.setType(2);
wrkMastSta1.setWrkType(6);
wrkMastStaService.insert(wrkMastSta1);
default:
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index d540eb6..bc0c41e 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -36,6 +36,7 @@
} else {
this.locType1 = 2; // 楂樺簱浣�
}
+ this.locType1 = 1; // 浣庡簱浣�
log.info(JSON.toJSONString(this));
}
--
Gitblit v1.9.1