From 2bd0f5e053cfe4dd90d6a5123474c9b41bcee94e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 11 十一月 2023 17:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 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 9bd886e..052cbf3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1213,7 +1213,7 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, startSta, targetSta, wrkMast.getWrkNo());
- if (wrkMast.getIoType() == 53) {
+ if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
//鎷ｆ枡鍐嶅洖搴擄紝閲嶆柊鍒嗛厤璁惧宸ヤ綔鍙�
Random random = new Random();
int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//鑾峰彇璁惧宸ヤ綔鍙�
@@ -2384,8 +2384,64 @@
ledCommand.setLocNo(wrkMast.getLocNo());
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()));
+ //
+ // 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()));
+ //}
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
+ locDetls.forEach(locDetl -> {
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no",wrkMast.getWrkNo());
+ Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
+ Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
+ Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
+ WrkDetl detl = wrkDetlService.selectOne(wrapper);
+ if (Cools.isEmpty(detl)) {
+ String suppCode = "";
+ if (locDetl.getSuppCode() != null) {
+ suppCode = locDetl.getSuppCode();
+ }
+ ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
+ } else {
+ String suppCode = "";
+ if (detl.getSuppCode() != null) {
+ suppCode = detl.getSuppCode();
+ }
+ ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode));
+ }
+ });
}
commands.add(ledCommand);
}
--
Gitblit v1.9.1