From 2a24c69b830d9dc97a8673f5f69418e9f95f3e1b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 10:43:33 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 d220b0a..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
@@ -5,10 +5,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+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.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;
@@ -48,6 +50,8 @@
* 鍗曟嵁鏃ユ湡
*/
@ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private String orderTime;
/**
@@ -62,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;
/**
* 鎵�灞炴満鏋�
*/
@@ -138,6 +160,23 @@
@ApiModelProperty(value= "鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚� ")
private Integer hasWave;
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ @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