From b6dd05e2397b5280add41464b36a67ef312a9a86 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 14 十二月 2023 11:31:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 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 9b7d133..6b15116 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -113,6 +113,8 @@
private ConfigService configService;
@Autowired
private NavigateMapUtils navigateMapUtils;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
/**
@@ -552,8 +554,17 @@
&& (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()) {
- staProtocol.setStaNo((short) 341);//鍐欏叆鐩爣绔�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ if (wrkMast == null) {
+ continue;
+ }
+ if (wrkMast.getSteNo() == null) {
+ wrkMast.setSteNo(1);
+ wrkMastMapper.updateById(wrkMast);
+ staProtocol.setStaNo((short) 341);//鍐欏叆鐩爣绔�
+ staProtocol.setPakMk(false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
}
}
@@ -655,8 +666,8 @@
continue;
}
- staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
} else if (code == 500) {
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -1192,15 +1203,15 @@
return false;//鍑哄簱绔欑偣涓嶅瓨鍦�
}
- if (!basDevp.getAutoing().equals("Y")) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鏄嚜鍔ㄧ姸鎬�",wrkMast.getWrkNo(),basDevp.getDevNo());
- return false;//涓嶆槸鑷姩鐘舵��
- }
-
- if (!basDevp.getOutEnable().equals("Y")) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), basDevp.getDevNo());
- return false;//鍑哄簱绔欑偣涓嶅彲鍑�
- }
+// if (!basDevp.getAutoing().equals("Y")) {
+// News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鏄嚜鍔ㄧ姸鎬�",wrkMast.getWrkNo(),basDevp.getDevNo());
+// return false;//涓嶆槸鑷姩鐘舵��
+// }
+//
+// if (!basDevp.getOutEnable().equals("Y")) {
+// News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), basDevp.getDevNo());
+// return false;//鍑哄簱绔欑偣涓嶅彲鍑�
+// }
Integer liftNo = basDevp.getLiftNo();//鎼滅储鍑哄簱鎻愬崌鏈烘槸鍚﹀瓨鍦ㄥ叆搴撲换鍔★紝濡傚瓨鍦ㄧ姝㈠嚭搴�
List<WrkMast> liftWrkMasts = wrkMastMapper.selectInWrkMastByLiftNo(liftNo);
@@ -2888,6 +2899,13 @@
wrkDetls.forEach(wrkDetl -> {
ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
});
+
+ if (wrkDetls.isEmpty()) {//浠庡巻鍙叉。鏌ヨ
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkMast.getWrkNo());
+ wrkDetlLogs.forEach(wrkDetl -> {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
+ });
+ }
}
}
@@ -2988,7 +3006,7 @@
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
- if (reset && !ledThread.isLedMk()) {
+ if (reset) {
ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
--
Gitblit v1.9.1