From 0017b42552d3d12dfa460b6c98b5fa6672f45309 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 十一月 2023 15:25:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 8c189ed..a10b9b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -918,6 +918,14 @@
return false;//瀛樺湪鍏ュ簱浠诲姟锛岀姝㈠嚭搴�
}
+ //鍚屽簱浣嶇粍鏍￠獙
+ List<String> outerLoc = Utils.getGroupOuterLoc(wrkMast.getSourceLocNo());
+ List<LocMast> outerLocMasts = locMastService.selectNotEmptyLocNos(outerLoc);
+ if (!outerLocMasts.isEmpty()) {
+ News.info("{}浠诲姟锛屾祬搴撲綅瀛樺湪璐х墿锛岀郴缁熺瓑寰呬腑", wrkMast.getWrkNo());
+ return false;//娴呭簱浣嶅瓨鍦ㄦ湭鎵ц浠诲姟
+ }
+
//鑾峰彇婧愮珯
LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(basDevp.getLiftNo(), Utils.getLev(wrkMast.getSourceLocNo()));
if (liftStaProtocol == null) {
@@ -1132,7 +1140,7 @@
//鎼滅储鏄惁鏈夊叾浠栦换鍔″崰鐢ㄤ簡鎻愬崌鏈猴紝濡傛灉鍗犵敤鎻愬崌鏈虹殑浠诲姟鍜屽綋鍓嶄换鍔＄浉鍚岋紝鍒欒繍琛屾墽琛�
WrkMast wrkMast1 = wrkMastMapper.selectLiftWrkMast(liftProtocol.getLiftNo().intValue());
if (wrkMast1 != null && wrkMast1.getWrkNo().intValue() != wrkMast.getWrkNo().intValue()) {
- News.info("{0}鍙锋彁鍗囨満锛岃鍏朵粬浠诲姟{1}鍗犵敤涓斿拰褰撳墠浠诲姟{2}涓嶇浉鍚岋紝绂佹娲惧彂", liftSlave.getId(), wrkMast1.getWrkNo(), wrkMast.getWrkNo());
+ News.info("{}鍙锋彁鍗囨満锛岃鍏朵粬浠诲姟{}鍗犵敤涓斿拰褰撳墠浠诲姟{}涓嶇浉鍚岋紝绂佹娲惧彂", liftSlave.getId(), wrkMast1.getWrkNo(), wrkMast.getWrkNo());
continue;
}
@@ -2311,6 +2319,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ log.info("鎮寕绾匡紝wms杩斿洖缁撴灉锛�" + jsonObject);
Integer code = jsonObject.getInteger("code");
if (code.equals(200)) {//鍛煎彨AGV
return true;
@@ -2496,6 +2505,7 @@
Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
+ Utils.wapperSetCondition(wrapper,"supp_code",locDetl.getSuppCode());//鏂欑鐮�
WrkDetl detl = wrkDetlService.selectOne(wrapper);
if (Cools.isEmpty(detl)) {
String suppCode = "";
@@ -2594,8 +2604,10 @@
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
StaProtocol staProtocol = devpThread.getStation().get(staNo);
- if (staProtocol == null) { continue; }
- if (staProtocol.getWorkNo() != 0) {
+ if (staProtocol == null) {
+ continue;
+ }
+ if (staProtocol.isLoading()) {
reset = false;
break;
}
@@ -2604,13 +2616,9 @@
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
if (reset && !ledThread.isLedMk()) {
- ledThread.setLedMk(false);
+ ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
- News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- }else {
-// News.error("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()));
- ledThread.setLedMk(false);
+ log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
}
}
}
--
Gitblit v1.9.1