From 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 10:32:42 +0800
Subject: [PATCH] 逻辑调整
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 50f5573..4d19ccb 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -6,16 +6,13 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.service.LocMastService;
+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;
@@ -46,17 +43,18 @@
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- @ExcelProperty("鎵瑰彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
@ApiModelProperty(value= "鍨嬪彿")
private String model;
@@ -136,7 +134,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -159,6 +157,49 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @TableField("pro_type")
+ private String proType;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+ @TableField("i_no")
+ private String i_no;
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
+ @TableField("i_no")
+ private Integer iNo;
+
+ @TableField("packing")
+ private String packing;
+
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -195,15 +236,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -235,7 +276,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
@@ -252,23 +292,15 @@
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 long getStoreDate(){
+ long timeNow = new Date().getTime();
+ long timeCreate = this.appeTime.getTime();
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
}
--
Gitblit v1.9.1