From a3048fa6fa72fa3cc5da2c43c59bd000e00c9599 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 23:13:32 +0800
Subject: [PATCH] 工控网分析程序状态问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
index 56794eb..cf5e743 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
@@ -2,22 +2,26 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.mdm.flow.constants.FlowConstant;
import java.time.LocalDate;
-import java.time.LocalDateTime;
@Data
@Schema(description = "浠诲姟璁″垝")
public class TaskAssignVO {
+ @Schema(description = "娴佺▼鏍囬")
+ private String title;
@Schema(description = "闆剁粍浠�/鍥惧彿")
- private String partNo;
+ private String drawingNo;
@Schema(description = "鍥惧彿鐗堟/璁捐鐗堟")
- private String partNoEdition;
+ private String drawingNoEdition;
@Schema(description = "宸ュ簭鍙�")
private String processNo;
@Schema(description = "宸ュ簭鍚嶇О")
private String processName;
-
+ @Schema(description = "浜у搧鍨嬪彿")
+ private String productModel;
@Schema(description = "宸ュ簭鐗堟")
private String processEdition;
@@ -35,6 +39,39 @@
@Schema(description = "璁″垝寮�宸ユ椂闂�")
private LocalDate planStartTime;
- @Schema(description = "涓诲埗鍒嗗伐琛↖D")
- private long producePlanId;
+
+ @Schema(description = "鍋忕鍗曞彿")
+ private String deviation;
+ @Schema(description = "鏄惁涓存椂娴佺▼锛屽��:Y/N")
+ private String isTempFlow;
+
+ @Schema(description = "浠诲姟娲惧伐璁板綍琛╥d")
+ private Long taskDispatchId;
+
+ @Schema(description = "浜哄憳鑱岃矗琛╥d锛岀晫闈笂闆朵欢鍙峰尮閰嶄笉涓婄敤鎴锋寚瀹氱殑")
+ private Long producePlanId;
+ @Schema(description = "宸ュ簭鍞竴鐮�(MES鎺ㄩ��)")
+ private String operationId;
+ @Schema(description = "宸ュ崟鍙�(MES鎺ㄩ��)")
+ private String orderNumber;
+ @Schema(description = "娲惧伐浜�(鎵嬪姩鎵嶆湁)")
+ private String dispatchBy;
+
+ @Schema(description = "鍒涘缓浜篿d")
+ private Long createUser;
+ /**
+ * 鏄惁 鏈� 绋嬪簭琛ュ厖娴佺▼锛堜复鏃舵祦绋嬶級
+ * @return 鏄惁
+ */
+ public boolean isTemporaryFlow(){
+ return FlowConstant.Y.equals(isTempFlow);
+ }
+
+ /**
+ * 鏄惁鍋忕鍗�
+ * @return 鏄惁
+ */
+ public boolean isDeviationFlow(){
+ return StringUtils.isNotBlank(deviation);
+ }
}
--
Gitblit v1.9.3