#

whycq

2022-11-16 a274cbb41ccb08ab2b88672324aa2e4b7faaa57c

#

 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()));
                        }
                    });
                }

 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;
    }
}

 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");