From 532e4cb20e82b7705dd65643cde8dfcf6cde8004 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 03 一月 2024 08:13:19 +0800
Subject: [PATCH] # 显示器
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 88 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 27 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 31c8325..a3cc3b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2907,36 +2907,70 @@
ledCommand.setBarcode(barcode);
if (ioType != 110 && ioType != 10) {
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- locDetls.forEach(locDetl -> {
- Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
- 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());//鏂欑鐮�
- List<WrkDetl> detl = wrkDetlService.selectList(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 {
- //鍑哄簱鏁伴噺绱
- Double conut = 0.0;
- for (WrkDetl wrkDetl : detl) {
- conut = conut + wrkDetl.getAnfme();
- }
-
- for (WrkDetl wrkDetl : detl) {
+ if (ioType == 101) {
+ locDetls.forEach(locDetl -> {
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
+ 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());//鏂欑鐮�
+ List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
+ if (Cools.isEmpty(detl)) {
String suppCode = "";
- if (wrkDetl.getSuppCode() != null) {
- suppCode = wrkDetl.getSuppCode();
+ if (locDetl.getSuppCode() != null) {
+ suppCode = locDetl.getSuppCode();
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
- }
- }
+ ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
+ } else {
+ //鍑哄簱鏁伴噺绱
+ Double conut = 0.0;
+ for (WrkDetl wrkDetl : detl) {
+ conut = conut + wrkDetl.getAnfme();
+ }
- });
+ for (WrkDetl wrkDetl : detl) {
+ String suppCode = "";
+ if (wrkDetl.getSuppCode() != null) {
+ suppCode = wrkDetl.getSuppCode();
+ }
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
+ }
+ }
+
+ });
+ } else {
+ locDetls.forEach(locDetl -> {
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
+ 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());//鏂欑鐮�
+ List<WrkDetl> detl = wrkDetlService.selectList(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 {
+ //鍑哄簱鏁伴噺绱
+ Double conut = 0.0;
+ for (WrkDetl wrkDetl : detl) {
+ conut = conut + wrkDetl.getAnfme();
+ }
+
+ for (WrkDetl wrkDetl : detl) {
+ String suppCode = "";
+ if (wrkDetl.getSuppCode() != null) {
+ suppCode = wrkDetl.getSuppCode();
+ }
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), 0D, wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
+ }
+ }
+
+ });
+ }
+
if (ioType == 107) {
locDetls = new ArrayList<>();
--
Gitblit v1.9.1