From 093c43638d3f9aa64fc3b396a0a2452cc28abbe3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 23 五月 2025 18:59:39 +0800 Subject: [PATCH] 生成移库任务 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 9 ++++----- 1 files changed, 4 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 833949c..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 @@ -62,13 +62,13 @@ * 浠诲姟鐘舵�� */ @ApiModelProperty(value= "浠诲姟鐘舵��") - private Short taskStatus; + private Integer taskStatus; /** * 浠诲姟绫诲瀷 */ @ApiModelProperty(value= "浠诲姟绫诲瀷") - private Short taskType; + private Integer taskType; /** * 婧愬簱浣� @@ -142,7 +142,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** @@ -187,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; @@ -259,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