From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 二月 2025 10:08:32 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java | 88 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java index fd97a50..1f811e6 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java @@ -1,9 +1,13 @@ package com.zy.asrs.wms.asrs.entity; import com.baomidou.mybatisplus.annotation.TableLogic; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.lang.reflect.Field; +import java.text.SimpleDateFormat; +import java.util.*; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.zy.asrs.common.utils.Synchro; import com.zy.asrs.wms.asrs.service.MatService; import com.zy.asrs.wms.asrs.service.OrderDetlLogService; import com.zy.asrs.wms.asrs.service.OrderLogService; @@ -101,6 +105,12 @@ */ @ApiModelProperty(value= "鐗╂枡ID") private Long matId; + + /** + * 鍟嗗搧缂栧彿 + */ + @ApiModelProperty(value= "鍟嗗搧缂栧彿") + private String matnr; /** * 鎵�灞炴満鏋� @@ -233,6 +243,24 @@ return null; } + public Mat getMat$(){ + MatService service = SpringUtils.getBean(MatService.class); + Mat mat = service.getById(this.matId); + if (!Cools.isEmpty(mat)){ + return mat; + } + return null; + } + + public TaskLog getTask$(){ + TaskLogService service = SpringUtils.getBean(TaskLogService.class); + TaskLog taskLog = service.getById(this.getTaskId()); + if (!Cools.isEmpty(taskLog)){ + return taskLog; + } + return null; + } + public String getHostId$(){ HostService service = SpringUtils.getBean(HostService.class); Host host = service.getById(this.hostId); @@ -298,5 +326,61 @@ return null; } + public void sync(Object source) { + Synchro.Copy(source, this); + } + + //鍔ㄦ�佹墿灞曞瓧娈� + public transient Map<String, Object> dynamicFields = new HashMap<>(); + + @JsonAnyGetter + public Map<String,Object> getDynamicFields() { + return dynamicFields; + } + + public void syncField(List<TaskDetlFieldLog> 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 (TaskDetlFieldLog taskDetlFieldLog : list) { + if (keys.contains(taskDetlFieldLog.getName())) { + continue; + } + dynamicFields.put(taskDetlFieldLog.getName(), taskDetlFieldLog.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