From 5524b5ab5f04fdb768d3eca092608cec34567d67 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期一, 05 六月 2023 12:07:06 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/MatDto.java | 10 +++++++++- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++--- 2 files changed, 12 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 697c0c2..debb4c3 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3875,13 +3875,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.getSpecs(), wrkDetl.getAnfme())); + ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme())); } if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) { - ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme())); + ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme())); } if (wrkMast.getIoType() == 107) { - ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme())); + ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), 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 619fbdd..342053a 100644 --- a/src/main/java/com/zy/common/model/MatDto.java +++ b/src/main/java/com/zy/common/model/MatDto.java @@ -18,17 +18,25 @@ private String specs; + // 瀹㈡埛淇℃伅 + private String manu; + + // 澶囨敞 + private String memo; + // 鐗╂枡鏁伴噺 private Double count; public MatDto() { } - public MatDto(String matnr, String maknx, String batch, String specs, Double count) { + public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count) { this.matnr = matnr; this.maknx = maknx; this.batch = batch; this.specs = specs; + this.manu = manu; + this.memo = memo; this.count = count; } } -- Gitblit v1.9.1