From 7925e2cfcdcb39e9ac6793edd5362bbe369def5c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 22 五月 2025 17:39:46 +0800
Subject: [PATCH] 保存拣料入库流水
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index 606c1b7..e58ebac 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -4,6 +4,7 @@
import java.util.*;
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;
@@ -61,13 +62,13 @@
* 浠诲姟鐘舵��
*/
@ApiModelProperty(value= "浠诲姟鐘舵��")
- private Short taskStatus;
+ private Integer taskStatus;
/**
* 浠诲姟绫诲瀷
*/
@ApiModelProperty(value= "浠诲姟绫诲瀷")
- private Short taskType;
+ private Integer taskType;
/**
* 婧愬簱浣�
@@ -141,7 +142,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -161,6 +161,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;
/**
@@ -174,6 +175,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;
/**
@@ -184,7 +186,7 @@
public TaskLog() {}
- public TaskLog(Long taskId,String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public TaskLog(Long taskId,String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.taskId = taskId;
this.taskCode = taskCode;
this.taskStatus = taskStatus;
@@ -256,7 +258,7 @@
DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
.eq(DictData::getValue, this.taskType));
- if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ if (Cools.isEmpty(dictDatas)) {
return null;
}
return dictDatas.getLabel();
--
Gitblit v1.9.1