From e19163def1da10e16ad5baf58131a1563acfe7e1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 二月 2026 15:24:21 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
index 8fbe04e..7167dc9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
@@ -77,9 +77,9 @@
private Long stepTemplateId;
/**
- * 鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎴愬姛 3-澶辫触 4-璺宠繃 5-瓒呮椂
+ * 鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�
*/
- @ApiModelProperty(value= "鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎴愬姛 3-澶辫触 4-璺宠繃 5-瓒呮椂")
+ @ApiModelProperty(value= "鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�")
private Short status;
/**
@@ -146,7 +146,18 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty(value= "wms涓嬩竴姝ヤ换鍔＄被鍨婭D")
+ private Integer wmsNextTaskStatus;
+
+ @ApiModelProperty(value= "wms褰撳墠浠诲姟绫诲瀷ID")
+ private Integer wmsNowTaskStatus;
+
public FlowStepInstance() {}
+ public FlowStepInstance(FlowStepTemplate flowStepTemplate) {
+ this.stepTemplateId = flowStepTemplate.getId();
+ this.stepName = flowStepTemplate.getStepName();
+ this.stepType = flowStepTemplate.getStepType();
+ }
public FlowStepInstance(Long flowInstanceId,String flowInstanceNo,Integer stepOrder,String stepCode,String stepName,String stepType,Long stepTemplateId,Short status,String executeResult,String errorCode,String errorMessage,Date startTime,Date endTime,Integer durationSeconds,String inputData,String outputData,Integer retryTimes,Date createTime,Date updateTime) {
this.flowInstanceId = flowInstanceId;
--
Gitblit v1.9.1