From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 44aada0..d8c68e7 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
@@ -10,6 +10,7 @@
import com.zy.asrs.wms.asrs.service.OrderTypeService;
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;
@@ -65,6 +66,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;
/**
* 鎵�灞炴満鏋�
*/
@@ -150,6 +169,14 @@
@TableField(exist = false)
private String orderStatus;
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ private Integer pickStatus;
+
public Order() {}
public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
--
Gitblit v1.9.1