From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
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: 姝ｅ父 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