From 0c4b48edb964d47a6db0e2f6a6073fade51c3c4d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 09:27:54 +0800
Subject: [PATCH] # 显示器
---
src/main/java/com/zy/common/model/MatDto.java | 11 +++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
2 files changed, 18 insertions(+), 1 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..0f54913 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,13 @@
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())));
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos()
+ .add(new MatDto(wrkDetl.getMatnr()
+ ,wrkDetl.getMaktx()
+ ,wrkDetl.getAnfme()
+ ,locDetlService.selectById(wrkDetl.getBarcode()).getAnfme()
+ ,wrkDetl.getSpecs()
+ ,wrkDetl.getSuppCode())));
}
commands.add(ledCommand);
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index adfd858..7eb3532 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -27,6 +27,9 @@
// 鐗╂枡鍚嶇О
private String model;
+ // 绠辩爜
+ private String containerCode;
+
// 鏉＄爜
private String batch;
@@ -62,4 +65,12 @@
this.count = count;
this.total = total;
}
+ public MatDto(String matNo, String maknx, Double count,Double total,String specs,String containerCode) {
+ this.containerCode = containerCode;
+ this.specs = specs;
+ this.matNo = matNo;
+ this.maknx = maknx;
+ this.count = count;
+ this.total = total;
+ }
}
--
Gitblit v1.9.1