From f52627e8432451f13bad65a5a6a0c165e16b0193 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期二, 01 四月 2025 10:06:20 +0800 Subject: [PATCH] 电视机新增图号显示 --- src/main/java/com/zy/asrs/entity/result/MatDto.java | 10 ++++++++++ src/main/java/com/zy/asrs/controller/TVController.java | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java index 246de60..ab53703 100644 --- a/src/main/java/com/zy/asrs/controller/TVController.java +++ b/src/main/java/com/zy/asrs/controller/TVController.java @@ -279,7 +279,7 @@ }catch (Exception e){ // log.error("宸ヤ綔妗f鏄庣粏杈撳叆鐢佃鏈哄け璐�1锛氬紓甯镐俊鎭�==銆�"+e); } - wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs()))); + wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getModel()))); } commands.add(ledCommand); diff --git a/src/main/java/com/zy/asrs/entity/result/MatDto.java b/src/main/java/com/zy/asrs/entity/result/MatDto.java index 06bf995..f9624d8 100644 --- a/src/main/java/com/zy/asrs/entity/result/MatDto.java +++ b/src/main/java/com/zy/asrs/entity/result/MatDto.java @@ -23,6 +23,8 @@ // 搴撲綅鏁伴噺 private Double total; + //鍥惧彿 + private String model; public MatDto() { } @@ -44,4 +46,12 @@ this.count = count; this.total = total; } + public MatDto(String matNo, String maknx, Double count, Double total, String specs,String model) { + this.specs = specs; + this.matnr = matNo; + this.maknx = maknx; + this.count = count; + this.total = total; + this.model = model; + } } -- Gitblit v1.9.1