From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index 3f2c2d4..d78bb3b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -8,6 +8,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.asrs.service.OrderSettleService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
+import com.zy.asrs.wms.asrs.service.WaveService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import io.swagger.models.auth.In;
@@ -26,6 +27,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_order")
@@ -65,6 +67,9 @@
*/
@ApiModelProperty(value= "鍗曟嵁鐘舵��")
private Long orderSettle;
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customer;
@ApiModelProperty("鐗╂祦鍚嶇О")
private String logisticsName;
@@ -165,6 +170,9 @@
*/
@TableField(exist = false)
private String orderStatus;
+
+ @TableField(exist = false)
+ private String site;
/**
* 璁㈠崟鐘舵��
@@ -273,6 +281,18 @@
return null;
}
+ public String getSite() {
+ if (!Cools.isEmpty(this.waveId)){
+ WaveService waveService = SpringUtils.getBean(WaveService.class);
+ Wave wave = waveService.getById(this.waveId);
+ if (!Cools.isEmpty(wave)){
+ return wave.getSite();
+ }
+ }
+ return null;
+ }
+
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
--
Gitblit v1.9.1