From 32f3f3e2e358e87d4c4e7edb142943f107a0cccf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 15:02:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 f32b182..45d38cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2385,7 +2385,44 @@
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()));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()));
+ locDetls.forEach(locDetl1 -> {
+ //宸ヤ綔妗ｄ腑瀛樺湪璇ョ墿鏂欏垯璺宠繃
+ String suppCode = "";
+
+ if (wrkDetl.getMatnr().equals(locDetl1.getMatnr())) {
+ Double anfme = 0D;
+ if (locDetl != null) {
+ anfme = locDetl.getAnfme();
+ }
+ if (wrkDetl.getSuppCode() != null) {
+ suppCode = wrkDetl.getSuppCode();
+ }
+ ledCommand.getMatDtos()
+ .add(new MatDto(wrkDetl.getMatnr()
+ , wrkDetl.getMaktx()
+ , wrkDetl.getAnfme()
+ , (wrkDetl.getAnfme()-anfme)
+ , wrkDetl.getSpecs()
+ , suppCode));
+ } else {
+ if (locDetl1.getSuppCode() != null) {
+ suppCode = locDetl1.getSuppCode();
+ }
+ ledCommand.getMatDtos()
+ .add(new MatDto(locDetl1.getMatnr()
+ , locDetl1.getMaktx()
+ , 0D
+ , locDetl1.getAnfme()
+ , locDetl1.getSpecs()
+ , suppCode));
+ }
+ });
+ //LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
+
+ }
}
commands.add(ledCommand);
}
@@ -2479,7 +2516,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