From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
index 1d2fc5c..83d6729 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
@@ -2,6 +2,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.flow.constants.FlowContants;
import java.time.LocalDate;
@@ -10,6 +12,8 @@
*/
@Data
public class FlowProgramProperties {
+ @Schema(description = "闆剁粍浠�/鍥惧彿")
+ private String title;
@Schema(description = "闆剁粍浠�/鍥惧彿")
private String drawingNo;
@Schema(description = "鍥惧彿鐗堟/璁捐鐗堟")
@@ -28,7 +32,8 @@
@Schema(description = "璁惧缂栧彿")
private String machineCode;
-
+ @Schema(description = "鏈哄簥缁勪唬鐮�")
+ private String machineGroupCode;
@Schema(description = "璁惧鍨嬪彿")
private String machineMode;
@@ -41,9 +46,52 @@
@Schema(description = "鏄惁鏈夊浐鍖栫▼搴�")
private String hasCuredProgram;
+ @Schema(description = "鍥哄寲绋嬪簭绋嬪簭鑺傜偣id锛堝鏋滄湁锛�")
+ private Long curedNodeId;
+
+ @Schema(description = "绋嬪簭绋嬪簭鑺傜偣id,鑳界‘瀹氳妭鐐筰d鐨勬祦绋嬩細鏈夎灞炴��")
+ private Long nodeId;
+
@Schema(description = "娴佺▼瀹炰緥id")
private String processInstanceId;
@Schema(description = "娴佺▼瀹氫箟key")
private String processDefinitionKey;
+ @Schema(description = "宸ュ簭鐗堟鏄惁涓�鑷�")
+ private String isProcessEditionSame;
+
+ @Schema(description = "鍋忕鍗曞彿")
+ private String deviation;
+
+ @Schema(description = "绋嬪簭鏄惁鍙敤鍒ゅ畾:Y/N")
+ private String cureProgramUseable;
+
+ @Schema(description = "涓撲笟缁勯暱id")
+ private Long teamLeaderId;
+ @Schema(description = "榛樿缂栫▼鍛榠d")
+ private Long programmerId;
+ @Schema(description = "榛樿鏍″鍛榠d")
+ private Long checkerId;
+ @Schema(description = "榛樿瀹℃牳楂樺笀ID")
+ private Long seniorId;
+
+ @Schema(description = "瀹為檯缂栫▼鍛榠d")
+ private Long actProgrammerId;
+
+ @Schema(description = "鏄惁涓存椂娴佺▼:Y/N")
+ private String isTempFlow;
+
+ @Schema(description = "鏁版帶绋嬪簭缂栧彿")
+ private String programNo;
+ @Schema(description = "瀹為檯缂栫▼鍛樺鍚�")
+ private String programmerName;
+ @Schema(description = "瀹為檯鏍″濮撳悕")
+ private Long actCheckerId;
+ @Schema(description = "瀹為檯鏍″濮撳悕")
+ private Long actSeniorId;
+
+
+
+ @Schema(description = "鐜板満缂栧埗鏍囪")
+ private String programOnMachine;
}
--
Gitblit v1.9.3