From d52bab61f91056e75e60ddeda76a72cd1bd63615 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 14:40:00 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 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..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
@@ -5,10 +5,13 @@
 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.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;
@@ -24,6 +27,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 @TableName("man_order")
@@ -48,6 +52,8 @@
      * 鍗曟嵁鏃ユ湡
      */
     @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private String orderTime;
 
     /**
@@ -62,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;
     /**
      * 鎵�灞炴満鏋�
      */
@@ -137,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() {}
 
@@ -237,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