From b7aa5c29e973b748db52e21216a128407cbfd53c Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 27 一月 2024 19:50:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 4422c70..0da05d6 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.RgvOneSignService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WrkMastStaInItHandler;
@@ -29,6 +31,8 @@
private BasDevpService basDevpService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
@@ -44,17 +48,41 @@
private void execute(){
for(Integer staNo : STA_WORK_CU){
BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0){
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
+ continue;
+ }
+ if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
+ if (!wrkMast.getStaNo().equals(122)){
+ continue;
+ }
+ }
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
+// if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
+// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+// if (rgvOneSign.getRgvOneSign()==1){
+// 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,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+ } else {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
@@ -62,28 +90,35 @@
for(Integer staNo : STA_WORK_RU){
BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0){
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (wrkMast.getWrkSts()!=2){
+ if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
continue;
}
- boolean wrkTypeSign = fillKM(wrkMast);
- if (wrkTypeSign){
+// boolean wrkTypeSign = fullKM(wrkMast);
- }
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
- }
+// if (wrkTypeSign){
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
+ if (result.getCode()==200) {
+ continue;
+ } else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+// }else {
+// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);
+// if (result.getCode()==200) {
+// continue;
+// } else {
+// System.out.println(staNo+"澶辫触锛�");
+// }
+// }
}
}
}
}
- public boolean fillKM(WrkMast wrkMast){
+ public boolean fullKM(WrkMast wrkMast){
if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
return true;
}
--
Gitblit v1.9.1