From b69d8253dbf8b29bca1ac5f6cf1f305e5e188f0a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 12 三月 2026 15:33:46 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 782c27b..7e0f291 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -51,6 +51,16 @@
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Integer taskStatus;
+ /** 鏄惁瀛樺湪鍙墽琛岀殑褰撳墠娴佺▼姝ラ锛岀敤浜庡垪琛ㄦ槸鍚﹀睍绀哄畬鎴愭寜閽� */
+ @TableField(exist = false,select = false)
+ @ApiModelProperty(value = "鏄惁鍙偣鍑诲畬鎴愶紙鏈夊綋鍓嶆楠や笖闈炵粓鎬侊級")
+ private Boolean canComplete;
+
+ /** 鏄惁鍙彇娑堬細娴佺▼姝ラ鑳藉搴斾笂 taskStatus 涓旀湭鍒版渶鍚庝竴姝�(9999) 鏃朵负 true */
+ @TableField(exist = false, select = false)
+ @ApiModelProperty(value = "鏄惁鍙彇娑�")
+ private Boolean canCancel;
+
@ApiModelProperty("涓婄骇浠诲姟ID")
private Long parentId;
@@ -212,10 +222,12 @@
private String endStep;
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Integer> targSiteArea;
+ private List<String> targSiteArea;
private String targLocArea;
+ private String targSiteAreaNow;
+
public Task() {}
public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Integer sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
--
Gitblit v1.9.1