From 4a129f05fb7369b7916ccd8e68e727bb182439f1 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期一, 12 八月 2024 11:21:46 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 83 ++++++++++++++++++++++++++++++++++------- 1 files changed, 68 insertions(+), 15 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java index cef2f5a..7472fb6 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.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.LocService; import com.zy.asrs.wms.asrs.service.MatService; import com.zy.asrs.wms.system.entity.Host; @@ -53,15 +57,15 @@ private String locNo; /** - * 鐗╂枡 + * 鍟嗗搧 */ - @ApiModelProperty(value= "鐗╂枡") + @ApiModelProperty(value= "鍟嗗搧") private Long matId; /** - * 鐗╂枡鍙� + * 鍟嗗搧缂栧彿 */ - @ApiModelProperty(value= "鐗╂枡鍙�") + @ApiModelProperty(value= "鍟嗗搧缂栧彿") private String matnr; /** @@ -81,12 +85,6 @@ */ @ApiModelProperty(value= "鏁伴噺") private Double anfme; - - /** - * 鎵╁睍 - */ - @ApiModelProperty(value= "鎵╁睍") - private String extend; /** * 鎵�灞炴満鏋� @@ -141,7 +139,7 @@ public LocDetl() {} - public LocDetl(Long locId,String locNo,Long matId,String matnr,String orderNo,String batch,Double anfme,String extend,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { + public LocDetl(Long locId,String locNo,Long matId,String matnr,String orderNo,String batch,Double anfme,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { this.locId = locId; this.locNo = locNo; this.matId = matId; @@ -149,7 +147,6 @@ this.orderNo = orderNo; this.batch = batch; this.anfme = anfme; - this.extend = extend; this.hostId = hostId; this.status = status; this.deleted = deleted; @@ -164,7 +161,7 @@ // null, // 搴撲綅 // null, // 搴撲綅鍙穂闈炵┖] // null, // 鐗╂枡 -// null, // 鐗╂枡鍙� +// null, // 鍟嗗搧缂栧彿 // null, // 璁㈠崟鍙� // null, // 鎵瑰彿 // null, // 鏁伴噺 @@ -262,5 +259,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<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