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 | 153 ++++++++++++++++++++++++++++++--------------------
1 files changed, 91 insertions(+), 62 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 8b5f33c..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
@@ -11,6 +11,7 @@
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatService;
+import com.zy.asrs.wms.asrs.service.TagService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import com.zy.asrs.wms.system.service.HostService;
@@ -35,7 +36,6 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -55,6 +55,9 @@
*/
@ApiModelProperty(value= "鍟嗗搧")
private Long matId;
+
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Integer orderType;
/**
* 鍟嗗搧缂栧彿
@@ -86,11 +89,32 @@
@ApiModelProperty(value= "鎵�灞炴満鏋�")
private Long hostId;
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("鍝佺墝")
+ private String brand;
+
+ @ApiModelProperty("棰滆壊")
+ private String color;
+
+ @ApiModelProperty("浜у湴")
+ private String origin;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+
+ @ApiModelProperty("鍒嗙被鏍囪瘑")
+ private Long tagId;
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
@@ -176,26 +200,31 @@
// null // 澶囨敞
// );
- public String getLocId$(){
- LocService service = SpringUtils.getBean(LocService.class);
- Loc loc = service.getById(this.locId);
- if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getLocNo());
+// public String getLocId$(){
+// LocService service = SpringUtils.getBean(LocService.class);
+// Loc loc = service.getById(this.locId);
+// if (!Cools.isEmpty(loc)){
+// return String.valueOf(loc.getLocNo());
+// }
+// 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);
@@ -279,56 +308,56 @@
}
//鍔ㄦ�佹墿灞曞瓧娈�
- public transient Map<String, Object> dynamicFields = new HashMap<>();
+// public transient Map<String, Object> dynamicFields = new HashMap<>();
- @JsonAnyGetter
- public Map<String,Object> getDynamicFields() {
- return dynamicFields;
- }
-
- public void syncField(List<LocDetlField> list) {
- ArrayList<String> keys = new ArrayList<>();
- Field[] fields = this.getClass().getFields();
- for (Field field : fields) {
- keys.add(field.getName());
- }
-
- Map<String, Object> dynamicFields = new HashMap<>();
- for (LocDetlField locDetlField : list) {
- if (keys.contains(locDetlField.getName())) {
- continue;
- }
- dynamicFields.put(locDetlField.getName(), locDetlField.getValue());
- }
-
- this.dynamicFields = dynamicFields;
- }
-
- public void syncFieldMap(Map<String, Object> map) {
- ArrayList<String> keys = new ArrayList<>();
- Field[] fields = this.getClass().getDeclaredFields();
- for (Field field : fields) {
- keys.add(field.getName());
- }
- keys.add("detlId");
-
- Map<String, Object> dynamicFields = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- if (keys.contains(entry.getKey())) {
- continue;
- }
- dynamicFields.put(entry.getKey(), entry.getValue());
- }
-
- this.dynamicFields = dynamicFields;
- }
-
- public String getFieldString(String key) {
- return dynamicFields.get(key).toString();
- }
-
- public void setField(String key, Object value) {
- dynamicFields.put(key, value);
- }
+// @JsonAnyGetter
+// public Map<String,Object> getDynamicFields() {
+// return dynamicFields;
+// }
+//
+// public void syncField(List<LocDetlField> list) {
+// ArrayList<String> keys = new ArrayList<>();
+// Field[] fields = this.getClass().getFields();
+// for (Field field : fields) {
+// keys.add(field.getName());
+// }
+//
+// Map<String, Object> dynamicFields = new HashMap<>();
+// for (LocDetlField locDetlField : list) {
+// if (keys.contains(locDetlField.getName())) {
+// continue;
+// }
+// dynamicFields.put(locDetlField.getName(), locDetlField.getValue());
+// }
+//
+// this.dynamicFields = dynamicFields;
+// }
+//
+// public void syncFieldMap(Map<String, Object> map) {
+// ArrayList<String> keys = new ArrayList<>();
+// Field[] fields = this.getClass().getDeclaredFields();
+// for (Field field : fields) {
+// keys.add(field.getName());
+// }
+// keys.add("detlId");
+//
+// Map<String, Object> dynamicFields = new HashMap<>();
+// for (Map.Entry<String, Object> entry : map.entrySet()) {
+// if (keys.contains(entry.getKey())) {
+// continue;
+// }
+// dynamicFields.put(entry.getKey(), entry.getValue());
+// }
+//
+// this.dynamicFields = dynamicFields;
+// }
+//
+// public String getFieldString(String key) {
+// return dynamicFields.get(key).toString();
+// }
+//
+// public void setField(String key, Object value) {
+// dynamicFields.put(key, value);
+// }
}
--
Gitblit v1.9.1