From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 21 八月 2025 13:23:22 +0800 Subject: [PATCH] no message --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java index 8dbe600..097c529 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java @@ -56,6 +56,9 @@ @ApiModelProperty(value= "鍟嗗搧") private Long matId; + @ApiModelProperty("浠撳簱绫诲瀷") + private Integer orderType; + /** * 鍟嗗搧缂栧彿 */ @@ -94,6 +97,15 @@ @ApiModelProperty("鍨嬪彿") private String model; + + @ApiModelProperty("鍝佺墝") + private String brand; + + @ApiModelProperty("棰滆壊") + private String color; + + @ApiModelProperty("浜у湴") + private String origin; /** * 鐘舵�� 1: 姝e父 0: 绂佺敤 @@ -197,27 +209,22 @@ // return null; // } -// public String getTagId$() { -// TagService tagService = SpringUtils.getBean(TagService.class); -// Tag byId = tagService.getById(this.tagId); -// if (!Cools.isEmpty(byId)){ -// return byId.getName(); -// } -// return null; -// } + public String getTagId$() { + TagService tagService = SpringUtils.getBean(TagService.class); + Tag byId = tagService.getById(this.tagId); + if (!Cools.isEmpty(byId)){ + return byId.getName(); + } + return null; + } - -// @Delegate(types = Mat.class) -// public Mat getMatId$(){ -// MatService service = SpringUtils.getBean(MatService.class); -// Mat mat = service.getById(this.matId); -// return mat; -// } + public String getType$() { + return (this.locNo.contains("B") || this.locNo.contains("C")) ? "骞冲簱" : "绔嬪簱"; + } public String getDewell$() { return DateUtils.diff(new Date(), createTime) + "澶�"; } - public String getHostId$(){ HostService service = SpringUtils.getBean(HostService.class); -- Gitblit v1.9.1