From 691c44a6700ba3c51884351e6de1b19ed258e950 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 09 十一月 2023 15:58:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 f7ef1d0..2920ec4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -634,7 +634,7 @@
*/
public synchronized void initRealtimeBasMap() {
for (int i = 1; i <= 10; i++) {//鎬诲叡鍥涘眰妤�
- Object data = redisUtil.get("realtimeBasMap_" + i);
+ Object data = redisUtil.get(RedisKeyType.MAP.key + i);
if (data == null) {//redis鍦板浘鏁版嵁涓虹┖锛屼粠鏁版嵁搴撲腑鑾峰彇
BasMap basMap = basMapService.selectLatestMap(i);
if (basMap == null) {
@@ -656,7 +656,7 @@
}
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set("realtimeBasMap_" + i, JSON.toJSONString(basMap));
+ redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
}
}
}
@@ -667,7 +667,7 @@
public synchronized void restartTaskFromRedis() {
HashMap<Object, Object> map = redisUtil.getRedis();
for (Object key : map.keySet()) {
- if (key.toString().contains("lift_wrk_no_")) {//鎻愬崌鏈轰换鍔�
+ if (key.toString().contains(RedisKeyType.LIFT.key)) {//鎻愬崌鏈轰换鍔�
LiftRedisCommand redisCommand = JSON.parseObject(map.get(key).toString(), LiftRedisCommand.class);
if (redisCommand == null) {
continue;
@@ -690,7 +690,7 @@
liftProtocol.setTaskNo(redisCommand.getWrkNo());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//宸ヤ綔鐘舵��
- }else if(key.toString().contains("shuttle_wrk_no_")){//鍥涘悜绌挎杞︿换鍔�
+ }else if(key.toString().contains(RedisKeyType.SHUTTLE.key)){//鍥涘悜绌挎杞︿换鍔�
ShuttleRedisCommand redisCommand = JSON.parseObject(map.get(key).toString(), ShuttleRedisCommand.class);
if (redisCommand == null) {
continue;
@@ -2385,7 +2385,20 @@
ledCommand.setStaNo(wrkMast.getStaNo());
if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getSpecs())));
+ for (WrkDetl wrkDetl : wrkDetls) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
+ Double anfme = 0D;
+ if (locDetl != null) {
+ anfme = locDetl.getAnfme();
+ }
+ ledCommand.getMatDtos()
+ .add(new MatDto(wrkDetl.getMatnr()
+ , wrkDetl.getMaktx()
+ , wrkDetl.getAnfme()
+ , anfme
+ , wrkDetl.getSpecs()
+ , wrkDetl.getSuppCode()));
+ }
}
commands.add(ledCommand);
}
@@ -2479,7 +2492,7 @@
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
if (reset && !ledThread.isLedMk()) {
- ledThread.setLedMk(true);
+ ledThread.setLedMk(false);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
}else {
--
Gitblit v1.9.1