From 2fc41a25a6acfad60e1ec6fa1234f98efb0b3a82 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 八月 2024 17:57:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java | 1 +
src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a0d5e80..9b6900c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5441,7 +5441,7 @@
if (basJarMastList.size() != jarMaxLoc){
return false;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0){
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0&&(basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7)){
return false;
}
@@ -8113,7 +8113,7 @@
}
}
} catch (Exception e){
- log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,寮傚父淇℃伅={}",e.getMessage());
+ log.error("纭寲鍖哄煙鍒嗘鍏呯數浠诲姟鍒涘缓寮傚父,寮傚父淇℃伅={}",e.getMessage());
}
return false;
}
@@ -8190,7 +8190,7 @@
}
}
} catch (Exception e){
- log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,寮傚父淇℃伅={}",e.getMessage());
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟鍏呯數浠诲姟瀹屾垚寮傚父,寮傚父淇℃伅={}",e.getMessage());
}
return false;
}
diff --git a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
index 0ac9f54..bf94419 100644
--- a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
@@ -34,7 +34,7 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//涓婁紶寮�寮忓喎鍗翠俊鍙�
int[] jarList =new int[]{1,2,3,4,5,6};
for (int jarNo : jarList){
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
index 70f7b86..c0d864a 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
@@ -21,4 +21,5 @@
private Integer ioType;// 鏄� 瀛楃涓� 鏃堕棿鎴�
private Integer devNo;// 鏄� 瀛楃涓� 鏃堕棿鎴�
private Double weight;// 鏄� 瀛楃涓� 鏃堕棿鎴�
+ private String wrkno;// 鏄� 瀛楃涓� 鏃堕棿鎴�
}
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index f2ed2b9..a462bfd 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -95,6 +95,7 @@
staEscalationParam.setOrderNo(wrkDetl.getSpecs());
staEscalationParam.setTaskNo(wrkDetl.getModel());
staEscalationParam.setWeight(wrkDetl.getWeight());
+ staEscalationParam.setWrkno(wrkDetl.getWrkNo().toString());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
--
Gitblit v1.9.1