From 675d66f1cbc7e92cc0fb4897664ee3a851072334 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 00:06:35 +0800
Subject: [PATCH] 优化固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 00d029a..e750191 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,30 +2,36 @@
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;
@Schema(description = "宸ヨ壓鐗堟")
private String craftEdition;
- @Schema(description = "璁惧缂栧彿")
+ @Schema(description = "鏈哄簥缂栧彿")
private String machineCode;
+ @Schema(description = "璁惧缂栧彿(mes鎺ュ彛浼犻��)")
+ private String equipmentCode;
@Schema(description = "璁惧鍨嬪彿")
private String machineMode;
@@ -35,7 +41,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