From 55df48de02ac8e60c2cc8248980b061aaec19389 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 14:12:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 6 +++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 6 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 78fbb95..4dea897 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1517,7 +1517,7 @@
// ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
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(),wrkDetl.getSpecs(),wrkDetl.getModel())));
}
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 54933ca..a454ca7 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -20,13 +20,17 @@
// 鐗╂枡鏁伴噺
private String specs;
+ // 鐗╂枡鏁伴噺
+ private String model;
+
public MatDto() {
}
- public MatDto(String matnr, String maknx, Double count, String specs) {
+ public MatDto(String matnr, String maknx, Double count, String specs,String model) {
this.matnr = matnr;
this.maknx = maknx;
this.count = count;
this.specs = specs;
+ this.model = model;
}
}
--
Gitblit v1.9.1