From c3617b473555b7b37755f92a04e258f0e55f333d Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 08 一月 2026 09:13:18 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 8 +++++++-
src/main/java/com/zy/asrs/entity/WrkMast.java | 12 +++++-------
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 21 +++++++++++++++++----
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 45a1719..7d690cf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -397,15 +398,12 @@
public Integer getStaNoCar$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
+ BasDevp basDevp = service.selectById(this.staNo);
if (!Cools.isEmpty(basDevp)){
- Integer devNoCar = basDevp.getDevNo();
- switch (devNoCar){
- case 1901:
- return 122;
- default:
- return devNoCar;
+ if (basDevp.getDevNo()==1901){
+ return 122;
}
+ return basDevp.getDevNo();
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index b361a5c..5c8887a 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -122,7 +122,7 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触1锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
@@ -201,17 +201,20 @@
if (wrkMast.getStaNoCar$()<118 || wrkMast.getStaNoCar$()>121){
continue;
}
+ log.info(staNo+"绔欑偣鍑嗗鐢熸垚灏忚溅浠诲姟锛岃繘鍏ョ▼搴�");
int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
if (count1+count2!=0){
continue;
}
+ log.info(staNo+"绔欑偣锛屾暟閲�1锛�"+count1+",鏁伴噺2:"+count2);
int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
if (countStart1+countStart2+countStart3!=0){
continue;
}
+ log.info(staNo+"绔欑偣锛屾暟閲�1锛�"+countStart1+",鏁伴噺2:"+countStart2+",鏁伴噺3:"+countStart3);
BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
if (!basDevpEnd.getAutoing().equals("Y")){
continue;
@@ -257,6 +260,7 @@
boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
if (wrkTypeSign) {
+ log.info(staNo+"绔欑偣鐢熸垚灏忚溅浠诲姟锛岃繘鍏ョ▼搴�;//3锛氬彇鏀�");
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
if (result.getCode()==200){
continue;
@@ -267,7 +271,7 @@
}
}
}catch (Exception e){
- log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_CU澶勭悊澶辫触2锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
@@ -293,6 +297,7 @@
// continue;
// }
// }
+ log.info(staNo+"绔欑偣鍑嗗鍒囨崲绔欑偣锛岃繘鍏ョ▼搴�");
if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
@@ -337,6 +342,7 @@
if (count2!=0){
continue;
}
+ log.info(staNo+"绔欑偣锛宼wo鏁伴噺1锛�"+count1+",鏁伴噺2:"+count2);
int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
if (countStart1!=0){
continue;
@@ -349,6 +355,7 @@
if (countStart3!=0){
continue;
}
+ log.info(staNo+"绔欑偣锛宼wo鏁伴噺1锛�"+countStart1+",鏁伴噺2:"+countStart2+",鏁伴噺3:"+countStart3);
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
@@ -371,16 +378,22 @@
}
}
if (staNoOther==1901){
+ log.info("鍑嗗鍒囨崲"+staNoOther+"绔欑偣");
boolean sign1901 = false;
for (Integer staNo1901 : STA_WORK_CU){
BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
+ if (Cools.isEmpty(basDevp1901)){
+ log.info("basDevp1901"+staNoOther+"涓虹┖");
+ continue;
+ }
WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
- if (wrkMast1901.getStaNo()==1901){
+ if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
sign1901 = true;
break;
}
}
if (sign1901){
+ log.info("瀛樺湪"+staNoOther+"绔欑偣浠诲姟锛岃烦杩�");
continue;
}
staNoOther = 122;
@@ -406,7 +419,7 @@
}
}
}catch (Exception e){
- log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_CU澶勭悊澶辫触3锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}catch (Exception e){
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 0a20e0b..3be7d3b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -377,16 +377,22 @@
}
}
if (staNoOther==1901){
+ log.info("鍑嗗鍒囨崲"+staNoOther+"绔欑偣");
boolean sign1901 = false;
for (Integer staNo1901 : STA_WORK_CU){
BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
+ if (Cools.isEmpty(basDevp1901)){
+ log.info("basDevp1901"+staNoOther+"涓虹┖");
+ continue;
+ }
WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
- if (wrkMast1901.getStaNo()==1901){
+ if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
sign1901 = true;
break;
}
}
if (sign1901){
+ log.info("瀛樺湪"+staNoOther+"绔欑偣浠诲姟锛岃烦杩�");
continue;
}
staNoOther = 122;
--
Gitblit v1.9.1