From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 168eba7..78c37f5 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
+import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -36,7 +35,7 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -155,6 +154,19 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
+
+ /**
+ * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ */
+ @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @TableField("mat_type")
+ private Integer matType;
+
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
+ private Long owner;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -166,6 +178,16 @@
return String.valueOf(this.beBatch);
}
}
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
@@ -219,23 +241,23 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void sync(Object dest) {
- try {
- BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class);
- PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
- BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
- PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
- for (PropertyDescriptor propertyDescriptor : sourceProperty) {
- for (PropertyDescriptor descriptor : destProperty) {
- if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
- descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this));
- break;
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
- }
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧";
+ case 2:
+ return "楂橀";
+ case 3:
+ return "娣锋斁";
+ default:
+ return "";
+ }
+ }
}
--
Gitblit v1.9.1