From 35ea66f025deeff46d9101a256151a8236a6aa24 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 09 八月 2024 15:55:11 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index eb6832b..eaf6735 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -56,30 +56,33 @@
private void execute(){
try{
for(Integer staNo : CRN_WORK_RU){
- BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y") && basDevp.getInEnable().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (wrkMast.getWrkSts()!=2){
- continue;
- }
- WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
- if (Cools.isEmpty(wrkMastCrn)){
- BasDevp basDevpOther = basDevpService.selectById(staNoOther(staNo));
- if (basDevpOther.getWrkNo()!=0 && basDevpOther.getLoading().equals("Y") && basDevpOther.getAutoing().equals("Y") && basDevpOther.getInEnable().equals("Y")){
- WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOther.getWrkNo()));
- if(Cools.isEmpty(wrkMastOther)){
- continue;
- }
- if (wrkMastOther.getWrkSts()!=2){
- continue;
- }
- if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,wrkMastOther);
- if (result.getCode()!=200){
- System.out.println(staNo+"澶辫触锛�");
+ WrkMastCrn wrkMastCrnAll = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("sta_no",staNo));
+ if (Cools.isEmpty(wrkMastCrnAll)){
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y") && basDevp.getInEnable().equals("Y")){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if(Cools.isEmpty(wrkMast)){
+ continue;
+ }
+ if (wrkMast.getWrkSts()!=2){
+ continue;
+ }
+ WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMastCrn)){
+ BasDevp basDevpOther = basDevpService.selectById(staNoOther(staNo));
+ if (basDevpOther.getWrkNo()!=0 && basDevpOther.getLoading().equals("Y") && basDevpOther.getAutoing().equals("Y") && basDevpOther.getInEnable().equals("Y")){
+ WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOther.getWrkNo()));
+ if(Cools.isEmpty(wrkMastOther)){
+ continue;
+ }
+ if (wrkMastOther.getWrkSts()!=2){
+ continue;
+ }
+ if (!Cools.isEmpty(wrkMast)){
+ ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,wrkMastOther);
+ if (result.getCode()!=200){
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
@@ -94,20 +97,26 @@
@Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
for(Integer staNo : CRN_WORK_CU) {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("source_sta_no", staNo).eq("wrk_sts", 11L)
- .orderBy("io_pri",false));
- for (WrkMast wrkMast:wrkMasts){
- try{
- int row = Utils.getRow(wrkMast.getSourceLocNo());
- if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
- WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
- if (Cools.isEmpty(wrkMastCrn)){
- ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
+ WrkMastCrn wrkMastCrnAll = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
+ if (Cools.isEmpty(wrkMastCrnAll)){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("source_sta_no", staNo).eq("wrk_sts", 11L)
+ .orderBy("io_pri",false));
+ for (WrkMast wrkMast:wrkMasts){
+ try{
+ int row = Utils.getRow(wrkMast.getSourceLocNo());
+ if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
+ WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkMastCrn)){
+ ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
+ if (result.isSuccess()) {
+ break;
+ }
+ }
}
+ }catch (Exception e){
+ log.error("宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚====銆嬪嚭搴撲换鍔＄敓鎴愬紓甯革細"+e.getMessage());
}
- }catch (Exception e){
- log.error("宸﹀彸鍙屽伐浣嶅爢鍨涙満鎵ц浠诲姟鐢熸垚====銆嬪嚭搴撲换鍔＄敓鎴愬紓甯革細"+e.getMessage());
}
}
}
--
Gitblit v1.9.1