From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java | 915 ++++++++++++++++++++++++++++----------------------------
1 files changed, 459 insertions(+), 456 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
index 721af0a..34a6a1e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -1,456 +1,459 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-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;
-import com.zy.asrs.wms.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@TableName("man_mat")
-public class Mat implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value = "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value = "缂栧彿")
- private String uuid;
-
- /**
- * 鏍囪瘑
- */
- @ApiModelProperty(value = "鏍囪瘑")
- private String flag;
-
- /**
- * 鎺掑簭
- */
- @ApiModelProperty(value = "鎺掑簭")
- private Integer sort;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value = "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- @TableField(fill = FieldFill.INSERT)
- private Integer status;
-
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
- private Integer deleted;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value = "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value = "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value = "淇敼鏃堕棿")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField(fill = FieldFill.UPDATE)
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value = "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value = "澶囨敞")
- private String memo;
-
- /**
- * 鎵�灞炲綊绫�
- */
- @ApiModelProperty(value = "鎵�灞炲綊绫�")
- private Long tagId;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value = "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鍒悕
- */
- @ApiModelProperty(value = "鍒悕")
- private String name;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value = "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value = "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value = "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value = "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value = "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value = "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value = "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value = "鍗曚綅閲�")
- private String units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value = "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value = "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value = "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value = "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value = "閲嶉噺")
- private String weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value = "闀垮害")
- private String length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value = "浣撶Н")
- private String volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value = "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value = "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value = "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 瀹夊叏搴撳瓨涓婇檺
- */
- @ApiModelProperty(value = "瀹夊叏搴撳瓨涓婇檺")
- private Double safeStockLimit;
-
- /**
- * 瀹夊叏搴撳瓨涓嬮檺
- */
- @ApiModelProperty(value = "瀹夊叏搴撳瓨涓嬮檺")
- private Double safeStockMinimum;
-
- /**
- * 鏈夋晥鏈�
- */
- @ApiModelProperty(value = "鏈夋晥鏈�")
- private String validity;
-
- public Mat() {
- }
-
- public Mat(String uuid, String flag, Integer sort, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Double safeStockLimit, Double safeStockMinimum, String validity) {
- this.uuid = uuid;
- this.flag = flag;
- this.sort = sort;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- this.tagId = tagId;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.deadTime = deadTime;
- this.safeStockLimit = safeStockLimit;
- this.safeStockMinimum = safeStockMinimum;
- this.validity = validity;
- }
-
- // Mat mat = new Mat(
-// null, // 缂栧彿
-// null, // 鏍囪瘑
-// null, // 鎺掑簭
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 澶囨敞
-// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍒悕
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null // 淇濊川鏈�
-// );
-
- public String getHostId$() {
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)) {
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public String getStatus$() {
- if (null == this.status) {
- return null;
- }
- switch (this.status) {
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$() {
- if (null == this.deleted) {
- return null;
- }
- switch (this.deleted) {
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
- public String getCreateTime$() {
- if (Cools.isEmpty(this.createTime)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$() {
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)) {
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$() {
- if (Cools.isEmpty(this.updateTime)) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$() {
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)) {
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getTagId$() {
- TagService service = SpringUtils.getBean(TagService.class);
- Tag tag = service.getById(this.tagId);
- if (!Cools.isEmpty(tag)) {
- return String.valueOf(tag.getName());
- }
- return null;
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-
- //鍔ㄦ�佹墿灞曞瓧娈�
- public transient Map<String, Object> dynamicFields;
-
- @JsonAnyGetter
- public Map<String, Object> getDynamicFields() {
- return dynamicFields;
- }
-
- public void syncField(List<MatFieldValue> list) {
- Map<String, Object> dynamicFields = new HashMap<>();
- for (MatFieldValue fieldValue : list) {
- dynamicFields.put(fieldValue.getName(), fieldValue.getValue());
- }
- this.dynamicFields = dynamicFields;
- }
-
- public String getFieldString(String key) {
- return dynamicFields.get(key).toString();
- }
-
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+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;
+import com.zy.asrs.wms.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@TableName("man_mat")
+public class Mat implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value = "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value = "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value = "鎺掑簭")
+ private Integer sort;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value = "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鎵�灞炲綊绫�
+ */
+ @ApiModelProperty(value = "鎵�灞炲綊绫�")
+ private Long tagId;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鍒悕
+ */
+ @ApiModelProperty(value = "鍒悕")
+ private String name;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private String units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String itemNum;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value = "閲嶉噺")
+ private String weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value = "闀垮害")
+ private String length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value = "浣撶Н")
+ private String volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String suppCode;
+
+ @ApiModelProperty("浣跨敤娆℃暟")
+ private Integer utiliz;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 瀹夊叏搴撳瓨涓婇檺
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨涓婇檺")
+ private Double safeStockLimit;
+
+ /**
+ * 瀹夊叏搴撳瓨涓嬮檺
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨涓嬮檺")
+ private Double safeStockMinimum;
+
+ /**
+ * 鏈夋晥鏈�
+ */
+ @ApiModelProperty(value = "鏈夋晥鏈�")
+ private String validity;
+
+ public Mat() {
+ }
+
+ public Mat(String uuid, String flag, Integer sort, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Double safeStockLimit, Double safeStockMinimum, String validity) {
+ this.uuid = uuid;
+ this.flag = flag;
+ this.sort = sort;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.tagId = tagId;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.name = name;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.weight = weight;
+ this.length = length;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.deadTime = deadTime;
+ this.safeStockLimit = safeStockLimit;
+ this.safeStockMinimum = safeStockMinimum;
+ this.validity = validity;
+ }
+
+ // Mat mat = new Mat(
+// null, // 缂栧彿
+// null, // 鏍囪瘑
+// null, // 鎺掑簭
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 鎵�灞炲綊绫�
+// null, // 鍟嗗搧缂栧彿[闈炵┖]
+// null, // 鍟嗗搧鍚嶇О
+// null, // 鍒悕
+// null, // 瑙勬牸
+// null, // 鍨嬪彿
+// null, // 棰滆壊
+// null, // 鍝佺墝
+// null, // 鍗曚綅
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍗曚綅閲�
+// null, // 鏉＄爜
+// null, // 浜у湴
+// null, // 鍘傚
+// null, // 鐢熶骇鏃ユ湡
+// null, // 鍝侀」鏁�
+// null, // 閲嶉噺
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null // 淇濊川鏈�
+// );
+
+ public String getHostId$() {
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)) {
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$() {
+ if (null == this.deleted) {
+ return null;
+ }
+ switch (this.deleted) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getTagId$() {
+ TagService service = SpringUtils.getBean(TagService.class);
+ Tag tag = service.getById(this.tagId);
+ if (!Cools.isEmpty(tag)) {
+ return String.valueOf(tag.getName());
+ }
+ return null;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields;
+
+ @JsonAnyGetter
+ public Map<String, Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public void syncField(List<MatFieldValue> list) {
+ Map<String, Object> dynamicFields = new HashMap<>();
+ for (MatFieldValue fieldValue : list) {
+ dynamicFields.put(fieldValue.getName(), fieldValue.getValue());
+ }
+ this.dynamicFields = dynamicFields;
+ }
+
+ public String getFieldString(String key) {
+ return dynamicFields.get(key).toString();
+ }
+
+}
--
Gitblit v1.9.1