From 8fb65b05c4e7abf048ef9b2f615d647226b06f1a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 十一月 2022 14:04:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 133 insertions(+), 22 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 51e1a4b..2994db2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1643,19 +1643,10 @@
// 绌挎杞﹂噸鏂板畾浣嶆帓鍒楀眰
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
if (steThread.confirmPos()) {
- // 绌挎杞︿笅鍙戝厖鐢典换鍔�
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.CHARGE_LEFT); // 浠诲姟妯″紡: 鍏呯數
- if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
- log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
- } else {
- // 27.鏀捐嚦鍏呯數浣� ===>> 28.寮�濮嬪厖鐢�
- wrkCharge.setWrkSts(28L);
- if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 27.鏀捐嚦鍏呯數浣� ===>> 28.寮�濮嬪厖鐢� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
- }
+ // 27.鏀捐嚦鍏呯數浣� ===>> 28.鍏呯數灏辩华
+ wrkCharge.setWrkSts(28L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 27.鏀捐嚦鍏呯數浣� ===>> 28.鍏呯數灏辩华 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
}
} else {
log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬厖鐢典换鍔″彿锛歿}", wrkCharge.getSteNo(), wrkCharge.getWrkNo());
@@ -1894,11 +1885,11 @@
} else {
steThread.setResetFlag(true);
}
- } else if (wrkCharge.getWrkSts() == 28) {
- // 28.寮�濮嬪厖鐢� ===>> 29.瀹屾垚鍏呯數
- wrkCharge.setWrkSts(29L);
+ } else if (wrkCharge.getWrkSts() == 29) {
+ // 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數
+ wrkCharge.setWrkSts(30L);
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 28.寮�濮嬪厖鐢� ===>> 29.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 29.寮�濮嬪厖鐢� ===>> 30.瀹屾垚鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
steThread.setResetFlag(true);
}
@@ -1906,7 +1897,7 @@
// 32.灏忚溅璧拌 ===>> 33.灏忚溅寰呮惉
wrkCharge.setWrkSts(33L);
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼婕旂ず浠诲姟鐘舵�� 25.灏忚溅鍘诲厖鐢� ===>> 26.绛夊緟鍏呯數 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼婕旂ず浠诲姟鐘舵�� 32.灏忚溅璧拌 ===>> 33.灏忚溅寰呮惉 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
} else {
steThread.setResetFlag(true);
}
@@ -2471,6 +2462,7 @@
if (steProtocol.getMode() == 0
|| !steProtocol.statusType.equals(SteStatusType.IDLE)
|| basSte.getPakMk().equals("Y")
+ || basSte.getAutoCharge().equals("N")
// || steProtocol.getChargeStatus() == 1
) {
continue;
@@ -2534,11 +2526,11 @@
if (steProtocol.getRow().intValue() == Utils.getRow(chargeLocNo)
&& steProtocol.getBay().intValue() == Utils.getBay(chargeLocNo)
&& steProtocol.getLev().intValue() == Utils.getLev(chargeLocNo)) {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 21.鍑嗗鍏呯數 => 24.灏忚溅鍒拌揪
- wrkCharge.setWrkSts(24L);
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 21.鍑嗗鍏呯數 => 28.鍏呯數灏辩华
+ wrkCharge.setWrkSts(28L);
wrkCharge.setModiTime(new Date());
if (!wrkChargeService.updateById(wrkCharge)) {
- log.error("淇敼鍏呯數浠诲姟鐘舵�� 21.鍑嗗鍏呯數 => 24.灏忚溅鍒拌揪 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 21.鍑嗗鍏呯數 => 28.鍏呯數灏辩华 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
}
} else {
this.letCarBeWaiting(wrkCharge, ste.getId());
@@ -2546,7 +2538,7 @@
} else {
// filter
- if (wrkCharge == null || (wrkCharge.getWrkSts() < 26 && steProtocol.getChargeStatus() == 1)) {
+ if (wrkCharge == null || (wrkCharge.getWrkSts() < 28 && steProtocol.getChargeStatus() == 1)) {
continue;
}
@@ -2663,6 +2655,21 @@
}
}
}
+ } else if (wrkCharge.getWrkSts() == 28L) {
+ // 绌挎杞︿笅鍙戝厖鐢典换鍔�
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
+ steCommand.setTaskMode(SteTaskModeType.CHARGE_LEFT); // 浠诲姟妯″紡: 鍏呯數
+ if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
+ log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
+ } else {
+ // 28.鍏呯數灏辩华 ===>> 29.寮�濮嬪厖鐢�
+ wrkCharge.setWrkSts(29L);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼鍏呯數浠诲姟鐘舵�� 28.鍏呯數灏辩华 ===>> 29.寮�濮嬪厖鐢� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ }
+ }
}
}
} catch (Exception e) {
@@ -2675,7 +2682,111 @@
* 灏忚溅浠庡厖鐢垫々 鑷� 寰呮満搴撲綅
*/
public synchronized void steFromChargeToIdleLoc() {
+ // 涓庡厖鐢典换鍔′笉鍚屾杩涜
+ if (null != wrkChargeService.selectWorking(null)) { return; }
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ // 妫�绱㈠厖鐢垫々
+ for (SteChargeType value : SteChargeType.values()) {
+ Integer steNo = basSteService.hasCarOfLocNo(value.locNo);
+ if (steNo != null) {
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ BasSte basSte = basSteService.selectById(steNo);
+ if (Cools.isEmpty(steProtocol, basSte)) {
+ continue;
+ }
+ // 1鍙峰厖鐢垫々
+ if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
+ continue;
+ }
+ // 2鍙峰厖鐢垫々
+ if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
+ continue;
+ }
+ // 3鍙峰厖鐢垫々
+ if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
+ continue;
+ }
+ // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
+ if (steProtocol.getChargeStatus() == 1) {
+ continue;
+ }
+ // case 1 : 鑷姩鍏呯數寮� 棣堢數 脳
+ // case 2 : 鑷姩鍏呯數寮� 婊＄數 鉁�
+ // case 3 : 鑷姩鍏呯數鍏� 棣堢數 鉁�
+ // case 4 : 鑷姩鍏呯數鍏� 婊＄數 鉁�
+ if (basSte.getAutoCharge().equals("Y")
+ && steProtocol.getCharge() < Float.parseFloat(basSte.getChargeLine())) {
+ continue;
+ }
+ // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
+ WrkCharge wrkCharge = new WrkCharge();
+ wrkCharge.setSteNo(steNo);
+ wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
+ wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
+ wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
+ wrkCharge.setIoPri((double) 10);
+ wrkCharge.setSourceLocNo(value.locNo);
+ wrkCharge.setLocNo(basSte.getIdleLoc());
+ wrkCharge.setMemo("reset");
+ if (!wrkChargeService.insert(wrkCharge)) {
+ log.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
+ continue;
+ }
+ // 1.鎼繍鑷冲浐瀹氶�氶亾
+ if (wrkCharge.getWrkSts() == 41L) {
+ // 鎼皬杞﹁嚦灏忚溅璧板悜閫氶亾
+ List<String> channel = slaveProperties.getChannel();
+ for (String channelLocNo : channel) {
+ Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
+ if (null != otherSte) {
+ log.warn("{}鍙峰皬杞︾Щ鍏}搴撲綅缁勫け璐ワ紝鍘熷洜锛氬瓨鍦▄}鍙风┛姊溅锛�", wrkCharge.getSteNo(), channelLocNo, otherSte);
+ } else {
+ // 鍥哄畾鍫嗗灈鏈�
+ int crnNo = 1;
+ LocMast channelLoc = locMastService.selectById(channelLocNo);
+
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) { continue; }
+ // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
+ // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), false).shortValue()); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(channelLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(channelLoc.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
+ log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
+ } else {
+ // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
+ steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), true), channelLoc.getBay1(), channelLoc.getLev1());
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍
+ Date now = new Date();
+ wrkCharge.setWrkSts(42L);
+ wrkCharge.setCrnStrTime(now);
+ wrkCharge.setModiTime(now);
+ if (!wrkChargeService.updateById(wrkCharge)) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ }
+ }
+ break;
+ }
+
+ }
+ }
+
+ }
+ }
+ }
}
--
Gitblit v1.9.1