From a2ef34a807b1f88ac9b18dae51adbf61ce821595 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:31:40 +0800
Subject: [PATCH] RCS对接优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 1dec3f3..8633508 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;
/**
* 婧愬簱浣�
@@ -83,9 +83,9 @@
private String targLoc;
/**
- * 鎵樼洏鐮�
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
@@ -142,6 +142,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -186,7 +187,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;
@@ -218,7 +219,7 @@
// null, // 浠诲姟绫诲瀷
// null, // 婧愬簱浣�
// null, // 鐩爣搴撲綅
-// null, // 鎵樼洏鐮�
+// null, // 鏂欑鐮�
// null, // 鏈哄櫒浜虹紪鐮�
// null, // 鎵ц鐘舵��
// null, // 寮傚父鎻忚堪
--
Gitblit v1.9.1