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/PickSheet.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
index 1a46193..52fcbeb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
@@ -3,22 +3,38 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Objects;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.asrs.service.PickSheetService;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * man_pick_sheet
  */
 @Data
+@Accessors(chain = true)
+@TableName("man_pick_sheet")
 public class PickSheet implements Serializable {
     /**
      * 涓婚敭
      */
+    @TableId
     private Long id;
 
     /**
      * 鍗曟嵁缂栧彿
      */
     private String pickNo;
+
+    @ApiModelProperty("鎷h揣鍗曠被鍨� {1. 娉㈡鍗曪紝 2. 搴撳瓨鍑哄簱}")
+    private Integer type;
 
     /**
      * 娉㈡鏍囪瘑
@@ -33,7 +49,7 @@
     /**
      * 鏁伴噺
      */
-    private BigDecimal anfme;
+    private Double anfme;
 
     /**
      * 澶囨敞
@@ -43,11 +59,15 @@
     /**
      * 鍒涘缓鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
     /**
      * 淇敼鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
     private Long hostId;
@@ -73,4 +93,16 @@
     private Integer deleted;
 
     private static final long serialVersionUID = 1L;
+
+
+    public String getType$() {
+        if (Objects.isNull(type)) {
+            return "娉㈡鍗曟嵁";
+        }
+        if (type == 2) {
+            return "鎵嬪姩鍑哄簱";
+        } else {
+            return "娉㈡鍗�";
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1