From daeda3ceebf1dafb388437423a983451720661a5 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 07 三月 2023 08:23:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 c32a5d8..c7a5445 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -408,7 +408,6 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990) {
wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo());
if (null == wrkMast) {
- News.error("{}浠诲姟鍙烽敊璇紝鏆傛棤鎷ｆ枡浠诲姟锛�", staProtocol.getWorkNo());
continue;
}
} else {
@@ -734,7 +733,9 @@
}
// 缃《浠诲姟
- wrkMast.setIoPri((double) 9999);
+ if (wrkMast.getIoPri()<8000){
+ wrkMast.setIoPri(wrkMast.getIoPri()+9000d);
+ }
wrkMastMapper.updateById(wrkMast);
// 鐩爣搴撲綅 ===>> 鏈�澶栧眰搴撲綅
@@ -949,7 +950,9 @@
}
// 缃《浠诲姟
- wrkMast.setIoPri((double) 9998);
+ if (wrkMast.getIoPri()<8000){
+ wrkMast.setIoPri(wrkMast.getIoPri()+8999d);
+ }
wrkMastMapper.updateById(wrkMast);
// 鏈�澶栧眰搴撲綅锛岀洿鎺ュ爢鍨涙満鍑哄簱
@@ -2586,14 +2589,18 @@
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, 1);
SteProtocol steProtocol = steThread.getSteProtocol();
if (null == wrkCharge) {
- if (steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()){
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(1); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(10060); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數
- if (!MessageQueue.offer(SlaveType.Ste, 1, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
+ try{
+ if (steProtocol.getChargeStatus()==(short)0 && steProtocol.isBrushConnect()){
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(1); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(10060); // 宸ヤ綔鍙�
+ steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE); // 浠诲姟妯″紡: 鏂紑鍏呯數
+ if (!MessageQueue.offer(SlaveType.Ste, 1, new Task(2, steCommand))) {
+ News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
+ }
}
+ }catch (Exception e){
+ return;
}
return;
}
--
Gitblit v1.9.1