From e01c5a713793239e26b2e304fafd551affa4bcfc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 17:36:18 +0800
Subject: [PATCH] 波次任务下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 9658a4e..85b1c07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -4,6 +4,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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,14 +26,13 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@TableName("man_task_item")
+@ApiModel(value = "TaskItem", description = "浠诲姟妗ｆ槑缁�")
public class TaskItem implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
/**
* ID
*/
@@ -64,6 +67,9 @@
@ApiModelProperty("鍗曟嵁绫诲瀷")
private String orderType;
+ @ApiModelProperty("涓氬姟绫诲瀷")
+ private Short wkType;
+
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long orderItemId;
/**
@@ -71,6 +77,9 @@
*/
@ApiModelProperty("鐗╂枡璺熻釜鐮�")
private String trackCode;
+
+ @ApiModelProperty("渚涘簲鍟嗘尝娆�")
+ private String splrBatch;
/**
* 鐗╂枡缂栫爜
*/
@@ -88,6 +97,12 @@
*/
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+
+ /**
+ * 搴撳瓨鏁伴噺
+ */
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ private Double stockQty;
/**
* 搴撳瓨鎵规
@@ -207,6 +222,18 @@
// null // 澶囨敞
// );
+ public String getOrderType$(){
+ if (null == this.orderType) {return null;}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+ .eq(DictData::getValue, this.orderType));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1