From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
index 1490cc7..0572776 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
@@ -3,6 +3,11 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -22,6 +27,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_wave")
@@ -70,11 +76,17 @@
@ApiModelProperty(value= "宸插畬鎴愭暟閲�")
private Double qty;
+ @ApiModelProperty("鐩爣浣嶇疆")
+ private String targSite;
+
/**
* 鍗曟嵁鏁伴噺
*/
@ApiModelProperty(value= "鍗曟嵁鏁伴噺")
private Integer orderNum;
+
+ @ApiModelProperty("鍝佺被鏁伴噺")
+ private Integer groupQty;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -93,6 +105,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -106,6 +119,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -176,19 +190,17 @@
}
public String getExceStatus$(){
- if (null == this.exceStatus){ return null; }
- switch (this.exceStatus){
- case 0:
- return "鍒濆鍖�";
- case 1:
- return "鐢熸垚浠诲姟";
- case 2:
- return "浠诲姟鎾";
- case 3:
- return "瀹屾垚";
- default:
- return String.valueOf(this.exceStatus);
+ if (Cools.isEmpty(this.exceStatus)) {
+ return null;
}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_WAVE_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
}
public String getStatus$(){
--
Gitblit v1.9.1