From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java
index 8b02b68..073733d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Wave.java
@@ -1,21 +1,22 @@
package com.zy.asrs.wms.asrs.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.service.WaveDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.utils.Utils;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,7 +28,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
@Data
@TableName("man_wave")
@@ -53,6 +53,12 @@
*/
@ApiModelProperty(value= "娉㈡绫诲瀷 0: 鎵嬪姩 1: 鑷姩 ")
private Integer waveType;
+
+ /**
+ * 娉㈡鐘舵�� 0: 鍒濆鍖� 1: 鐢熸垚浠诲姟 2: 浠诲姟鎾 3: 瀹屾垚
+ */
+ @ApiModelProperty(value= "娉㈡鐘舵�� 0: 鍒濆鍖� 1: 鐢熸垚浠诲姟 2: 浠诲姟鎾 3: 瀹屾垚 ")
+ private Integer waveStatus;
/**
* 鎵�灞炴満鏋�
@@ -104,6 +110,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private Boolean generateTask;
+
public Wave() {}
public Wave(String waveNo,Integer waveType,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
@@ -144,6 +153,22 @@
}
}
+ public String getWaveStatus$(){
+ if (null == this.waveStatus){ return null; }
+ switch (this.waveStatus){
+ case 0:
+ return "鍒濆鍖�";
+ case 1:
+ return "鐢熸垚浠诲姟";
+ case 2:
+ return "浠诲姟鎾";
+ case 3:
+ return "瀹屾垚";
+ default:
+ return String.valueOf(this.waveStatus);
+ }
+ }
+
public List<WaveDetl> getWaveDetlList(){
if (null == this.id){ return null; }
WaveDetlService service = SpringUtils.getBean(WaveDetlService.class);
@@ -151,6 +176,11 @@
if (waveDetls.isEmpty()) {
return null;
}
+ for (WaveDetl waveDetl : waveDetls) {
+ String fieldParams = waveDetl.getFieldParams();
+ List<FieldParam> list = JSON.parseArray(fieldParams, FieldParam.class);
+ waveDetl.setDynamicFields(list);
+ }
return waveDetls;
}
--
Gitblit v1.9.1