From d647ee9a9564a769f053d93bd7cf6e95dd8f5b3c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 19 九月 2024 16:18:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 2ab47e1..f08621d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -6,17 +6,14 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.service.OrderService;
+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 org.springframework.format.annotation.DateTimeFormat;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -58,10 +55,20 @@
/**
* 浣滀笟鏁伴噺
*
- * 1. 鍏ュ簱 : qty 馃憜
- * 1. 鍑哄簱 : qty 馃憜
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ *
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value= "瀹屾垚鏁伴噺")
private Double qty;
/**
@@ -229,7 +236,7 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -436,30 +443,24 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
}
+// if (null != this.anfme && this.qty != null) {
+// return this.anfme - this.qty;
+// }
return null;
}
- 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 getQty$(){
+ if (getAnfme().equals(getQty())){
+ return "宸插畬鎴�";
}
+ return "鏈畬鎴�";
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1