From 53e508d8a4c33447e4725a1ab744e2dfca3e11df Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 03 九月 2024 08:59:40 +0800
Subject: [PATCH] 一楼反修入库修改
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ba91046..f07627f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,17 +2,16 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
+import com.zy.asrs.service.BasBoxTypeService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
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;
@@ -52,7 +51,7 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
private String matnr;
/**
@@ -131,7 +130,7 @@
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "浜у湴 //姹熼摐 鏈ㄧ浣嶇疆")
private String origin;
/**
@@ -207,7 +206,7 @@
private Integer beBatch;
/**
- * 淇濊川鏈�
+ * 淇濊川鏈� 銆併�佹睙閾滐細鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
@@ -221,13 +220,14 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佹睙閾滐細鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鏈媶锛堥粯璁わ級 1: 宸叉媶
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
@@ -272,6 +272,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍗蜂俊鎭疘D
+ */
+ @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+ @TableField("roll_up")
+ private Long rollUp;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -291,17 +298,37 @@
}
}
+// public String getSource$(){
+// if (null == this.source){ return null; }
+// switch (this.source){
+// case 1:
+// return "鍒堕��";
+// case 2:
+// return "閲囪喘";
+// case 3:
+// return "澶栧崗";
+// default:
+// return String.valueOf(this.source);
+// }
+// }
+
public String getSource$(){
- if (null == this.source){ return null; }
+ if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
+ return "宸茬‘璁�";
default:
- return String.valueOf(this.source);
+ return "鏈‘璁�";
+ }
+ }
+
+ public String getDeadTime(){
+ if (null == this.source){ return "鏈‘璁�"; }
+ switch (this.source){
+ case 1:
+ return "宸茬‘璁�";
+ default:
+ return "鏈‘璁�";
}
}
@@ -361,23 +388,17 @@
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 String getBrand$(){
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+ if (!Cools.isEmpty(basBoxType)){
+ return String.valueOf(basBoxType.getBoxSpecs());
}
+ return this.brand;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
}
--
Gitblit v1.9.1