From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
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("鎷ｈ揣鍗曠被鍨� {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