From a274cbb41ccb08ab2b88672324aa2e4b7faaa57c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 16 十一月 2022 11:13:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/MatDto.java               |    5 ++++-
 src/main/java/com/zy/core/thread/LedThread.java             |    2 +-
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 +++++--
 3 files changed, 10 insertions(+), 4 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 408cca5..448bba8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3079,10 +3079,13 @@
                     List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
                     wrkDetls.forEach(wrkDetl -> {
                         if (wrkMast.getIoType() == 101) {
-                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
                         }
                         if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
-                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
+                        }
+                        if (wrkMast.getIoType() == 107) {
+                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
                         }
                     });
                 }
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 7c19f47..04cf768 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -16,16 +16,19 @@
 
     private String batch;
 
+    private String specs;
+
     // 鐗╂枡鏁伴噺
     private Double count;
 
     public MatDto() {
     }
 
-    public MatDto(String matnr, String maknx, String batch, Double count) {
+    public MatDto(String matnr, String maknx, String batch, String specs, Double count) {
         this.matnr = matnr;
         this.maknx = maknx;
         this.batch = batch;
+        this.batch = specs;
         this.count = count;
     }
 }
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index e37e85a..f7805c9 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -78,7 +78,7 @@
             sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
             if (!command.isEmptyMk()) {
                 for (MatDto matDto : command.getMatDtos()) {
-                    sb.append(matDto.getMatnr()).append("-").append(matDto.getBatch()).append("\n");
+                    sb.append(matDto.getSpecs()).append("-").append(matDto.getBatch()).append("\n");
                 }
             }
             sb.append("\n");

--
Gitblit v1.9.1