From 29e8cbccfba7cd77026c724d093d6a82da99e5af Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 九月 2022 13:55:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 63 +++++++++++++------------------
src/main/webapp/views/ste.html | 3 +
src/main/java/com/zy/core/enums/SteTaskModeType.java | 7 ++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +
4 files changed, 35 insertions(+), 40 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 e1724b2..be64108 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1655,29 +1655,12 @@
steThread.setResetFlag(true);
}
} else if (wrkCharge.getWrkSts() == 25) {
- // 25.灏忚溅琛岄┒ ===>> 26.绛夊緟鍏呯數
+ // 25.灏忚溅鍘诲厖鐢� ===>> 26.绛夊緟鍏呯數
wrkCharge.setWrkSts(26L);
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 25.灏忚溅琛岄┒ ===>> 26.绛夊緟鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 25.灏忚溅鍘诲厖鐢� ===>> 26.绛夊緟鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
steThread.setResetFlag(true);
- }
- } else if (wrkCharge.getWrkSts() == 27) {
- // 缁欒緭閫佺嚎涓嬪彂鍏呯數浠诲姟
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- SteChargeType steChargeType = SteChargeType.get(wrkCharge.getLocNo());
- if (null != steChargeType) {
- if (devpThread.charge(steChargeType.ssbm - 1, true)) {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 27.杈撻�佺嚎涓婄數 ===> 28.瀹屾垚鍏呯數
- wrkCharge.setWrkSts(28L);
- if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 27.杈撻�佺嚎涓婄數 ===> 28.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
- } else {
- steThread.setResetFlag(true);
- }
- }
- } else {
- log.error("鑾峰彇鍏呯數妗╁彿澶辫触锛岃В鏋愬簱浣嶏細{}", wrkCharge.getLocNo());
}
}
}
@@ -2078,7 +2061,8 @@
if (steProtocol.getMode() == 0
|| !steProtocol.statusType.equals(SteStatusType.IDLE)
|| basSte.getPakMk().equals("Y")
- || steProtocol.getChargeStatus() == 1) {
+// || steProtocol.getChargeStatus() == 1
+ ) {
continue;
}
if (!steProtocol.isEnable()) {
@@ -2116,6 +2100,11 @@
}
} else {
+ // filter
+ if (wrkCharge.getWrkSts() < 26 && steProtocol.getChargeStatus() == 1) {
+ continue;
+ }
+
// 22.灏忚溅寰呮惉
if (wrkCharge.getWrkSts() == 22) {
// 鎼皬杞﹁嚦鍏呯數搴撲綅
@@ -2151,6 +2140,7 @@
} else if (wrkCharge.getWrkSts() == 24L) {
// 灏忚溅琛岄┒鑷冲厖鐢典綅
if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
+ if (steProtocol.getChargeStatus() == 1) { continue; }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
@@ -2159,32 +2149,33 @@
if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
} else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 24.灏忚溅鍒拌揪 ===> 25.灏忚溅琛岄┒
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 24.灏忚溅鍒拌揪 ===> 25.灏忚溅鍘诲厖鐢�
wrkCharge.setWrkSts(25L);
Date now = new Date();
wrkCharge.setCrnEndTime(now);
wrkCharge.setModiTime(now);
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 24.灏忚溅鍒拌揪 ===> 25.灏忚溅琛岄┒ 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 24.灏忚溅鍒拌揪 ===> 25.灏忚溅鍘诲厖鐢� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
}
}
}
} else if (wrkCharge.getWrkSts() == 26) {
- if (steProtocol.getChargeStatus() == 1) { continue; }
- // 绌挎杞﹀厖鐢靛懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.CHARGE);
- if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
- log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 26.绛夊緟鍏呯數 ===> 27.杈撻�佺嚎涓婄數
- wrkCharge.setWrkSts(27L);
- wrkCharge.setModiTime(new Date());
- if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 26.绛夊緟鍏呯數 ===> 27.杈撻�佺嚎涓婄數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ if (steProtocol.getChargeStatus() == 0) { continue; }
+ // 缁欒緭閫佺嚎涓嬪彂鍏呯數浠诲姟
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SteChargeType steChargeType = SteChargeType.get(wrkCharge.getLocNo());
+ if (null != steChargeType) {
+ if (devpThread.charge(steChargeType.ssbm - 1, true)) {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 26.绛夊緟鍏呯數 ===> 28.瀹屾垚鍏呯數
+ wrkCharge.setWrkSts(28L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 26.绛夊緟鍏呯數 ===> 28.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ } else {
+ steThread.setResetFlag(true);
+ }
}
+ } else {
+ log.error("鑾峰彇鍏呯數妗╁彿澶辫触锛岃В鏋愬簱浣嶏細{}", wrkCharge.getLocNo());
}
}
}
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 0f548ef..109da35 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -19,7 +19,8 @@
WAITING_LEFT(10, "宸﹀緟鏈�"), // B鐐�
// FIT_LEFT(11, "宸︽惉绉�"), // 宸︽惉绉�
// FIT_RIGHT(12, "鍙虫惉绉�"), // 鍙虫惉绉�
- CHARGE(13, "鍏呯數"), // 鍏呯數
+ CHARGE_LEFT(13, "宸﹀厖鐢�"), // 宸﹀厖鐢�
+ CHARGE_RIGHT(14, "鍙冲厖鐢�"), // 宸﹀厖鐢�
// CHECK_LEFT(14, "宸︾洏鐐�"), // 宸︾洏鐐�
// CHECK_RIGHT(15, "鍙崇洏鐐�"), // 鍙崇洏鐐�
CLOSE_CHARGE(17, "鏂紑鍏呯數"), // 鏂紑鍏呯數
@@ -252,7 +253,7 @@
case 16:
case 17:
case 18:
- return SteTaskModeType.BACK_ORIGIN;
+ return SteTaskModeType.CHARGE_LEFT;
case 4:
case 5:
case 6:
@@ -263,7 +264,7 @@
case 19:
case 20:
case 21:
- return SteTaskModeType.GO_ORIGIN;
+ return SteTaskModeType.CHARGE_RIGHT;
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 28e6958..d74e6e3 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -273,6 +273,8 @@
if (!write.IsSuccess) {
log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
return false;
+ } else {
+ log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗鎴愬姛", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
}
return true;
}
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 7c60c8d..fef6d07 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -123,7 +123,8 @@
<button class="item" onclick="steOperator(9)">鍙冲緟鏈�</button>
<!-- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
<!-- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
- <button class="item" onclick="steOperator(13)">寮�濮嬪厖鐢�</button>
+ <button class="item" onclick="steOperator(13)">宸﹀厖鐢�</button>
+ <button class="item" onclick="steOperator(14)">鍙冲厖鐢�</button>
<button class="item" onclick="steOperator(17)">鏂紑鍏呯數</button>
<!-- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
<!-- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
--
Gitblit v1.9.1