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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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 051eb49..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,8 +8,10 @@
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;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -25,6 +27,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_order")
@@ -65,6 +68,24 @@
@ApiModelProperty(value= "鍗曟嵁鐘舵��")
private Long orderSettle;
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customer;
+
+ @ApiModelProperty("鐗╂祦鍚嶇О")
+ private String logisticsName;
+
+ @ApiModelProperty("鏀惰揣鍦板潃")
+ private String address;
+
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ private String phone;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ private String logistics;
+
+ @ApiModelProperty("璁㈠崟鏁伴噺")
+ @TableField(exist = false)
+ private Double waitQty;
/**
* 鎵�灞炴満鏋�
*/
@@ -140,6 +161,26 @@
*/
@ApiModelProperty(value= "鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚� ")
private Integer hasWave;
+
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ @TableField(exist = false)
+ private String orderStatus;
+
+ @TableField(exist = false)
+ private String site;
+
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ private Integer pickStatus;
public Order() {}
@@ -240,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