From 5d468e5ccd96dc068d91d593c770643ecdc6f1af Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:34:41 +0800
Subject: [PATCH] 1. 入库历史订单明细数据丢失 2. 库存信息响应问题 3. 出库明细新加客户信息 4. 库存明细增加查询条件 5. 出库修改物料来源
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 133 ++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 55 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 c6999f5..bf47a32 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;
@@ -85,11 +86,23 @@
@ApiModelProperty(value= "鎵�灞炴満鏋�")
private Long hostId;
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+
+ @ApiModelProperty("鍒嗙被鏍囪瘑")
+ private Long tagId;
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
@@ -184,12 +197,22 @@
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 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 getDewell$() {
return DateUtils.diff(new Date(), createTime) + "澶�";
@@ -278,56 +301,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