From 46793d6a0e430a290ffc02ff0460342361cd7f32 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 05 一月 2024 16:18:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | 26 ++++++++++---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 15 +++++++
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 36 +++++++++++++-----
3 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index 4eddcd1..5573e82 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -122,7 +122,7 @@
this.wrkStart = wrkMast.getSourceStaNo();
this.wrkEnd = wrkMast.getStaNo();
this.staStart = basDevp.getDevNo();
- this.staEnd = wrkMast.getStaNo();
+ this.staEnd = getStaEnd(wrkMast.getStaNo());
this.createTime = now;
this.updateTime = now;
this.wrkSts = 0;
@@ -180,5 +180,18 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
}
+ public Integer getStaEnd(Integer souSta){
+ switch (souSta){
+ case 100:
+ case 103:
+ case 106:
+ case 109:
+ case 112:
+ case 115:
+ return souSta+1;
+ default:return souSta;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 4422c70..26c8166 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -49,12 +49,28 @@
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
+ boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,1);
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
+ if (wrkTypeSign) {
+// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,11);//1:鍙栵紙鍙犵洏锛�
+// if (result.getCode()==200){
+// continue;
+// }else {
+// System.out.println(staNo+"澶辫触锛�");
+// }
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+ } else {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
@@ -67,15 +83,15 @@
if (wrkMast.getWrkSts()!=2){
continue;
}
- boolean wrkTypeSign = fillKM(wrkMast);
+ boolean wrkTypeSign = fullKM(wrkMast);
if (wrkTypeSign){
-
+ boolean equals = wrkMast.getIoType().equals(1);
}
if (!Cools.isEmpty(wrkMast)){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
- if (result.getCode()==200){
+ if (result.getCode()==200) {
continue;
- }else {
+ } else {
System.out.println(staNo+"澶辫触锛�");
}
}
@@ -83,7 +99,7 @@
}
}
- public boolean fillKM(WrkMast wrkMast){
+ public boolean fullKM(WrkMast wrkMast){
if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
return true;
}
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 40d8991..fa510cc 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -34,18 +34,32 @@
try {
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
switch (type){
- case 11://婊″嚭
+ case 13://鍑� 3锛氬彇鏀�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
- wrkMastSta1.setWrkType(3);
+ wrkMastSta1.setType(fullKM(wrkMast)? 0:1); //绫诲瀷 0:闈炵┖ 1:绌烘澘
+ wrkMastSta1.setWrkType(3); //宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�
wrkMastStaService.insert(wrkMastSta1);
}
break;
- case 2://鍏�
+ case 21://1:鍙栵紙鍙犵洏锛�
if (Cools.isEmpty(wrkMastSta)){
WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
+ wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
+ wrkMastSta1.setWrkType(1);
+ wrkMastStaService.insert(wrkMastSta1);
+ }
+ case 22://2锛氭斁
+ if (Cools.isEmpty(wrkMastSta)){
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
+ wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
+ wrkMastSta1.setWrkType(2);
+ wrkMastStaService.insert(wrkMastSta1);
+ }
+ case 23://3锛氬彇鏀�
+ if (Cools.isEmpty(wrkMastSta)){
+ WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
+ wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
wrkMastSta1.setWrkType(3);
wrkMastStaService.insert(wrkMastSta1);
}
@@ -60,7 +74,7 @@
return FAIL;
}
- public boolean fillKM(WrkMast wrkMast){
+ public boolean fullKM(WrkMast wrkMast){
if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
return true;
}
--
Gitblit v1.9.1