From 143e74027f8b68fb7fa4dcd0026ccfa1e0e16788 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 16:41:45 +0800
Subject: [PATCH] mes接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/vo/MesTaskVO.java | 69 ++++++++++------------------------
1 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/vo/MesTaskVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/vo/MesTaskVO.java
index 6a380a3..68e49de 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/vo/MesTaskVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/vo/MesTaskVO.java
@@ -2,70 +2,41 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.mdm.flow.constants.FlowContants;
-
-import java.time.LocalDate;
@Data
@Schema(description = "MES浠诲姟璁″垝")
public class MesTaskVO {
- @Schema(description = "娴佺▼鏍囬")
- private String title;
- @Schema(description = "闆剁粍浠�/鍥惧彿")
- private String drawingNo;
- @Schema(description = "鍥惧彿鐗堟/璁捐鐗堟")
- private String drawingNoEdition;
+ @Schema(description = "宸ュ崟鍙�")
+ private String orderNumber;
+ @Schema(description = "鍥惧彿")
+ private String drawingCode;
+ @Schema(description = "鍥剧焊鐗堟")
+ private String drawingVersion;
@Schema(description = "宸ュ簭鍙�")
- private String processNo;
+ private String operationCode;
@Schema(description = "宸ュ簭鍚嶇О")
- private String processName;
- @Schema(description = "浜у搧鍨嬪彿")
- private String productModel;
+ private String operationName;
@Schema(description = "宸ュ簭鐗堟")
- private String processEdition;
+ private String operationVersion;
@Schema(description = "宸ヨ壓鐗堟")
- private String craftEdition;
+ private String routingVersion;
+
+ @Schema(description = "宸ュ簭鍞竴鐮�")
+ private String operationId;
@Schema(description = "璁惧缂栧彿")
- private String machineCode;
+ private String equipmentCode;
@Schema(description = "璁惧鍨嬪彿")
- private String machineMode;
-
- @Schema(description = "璁″垝閿佸畾鏃堕棿(澶�)")
- private Integer planLockDays;
+ private String equipmentModel;
+ @Schema(description = "娲惧伐浜猴紙鎵嬪姩娲惧伐鎵�)")
+ private String dspatchBy;
@Schema(description = "璁″垝寮�宸ユ椂闂�")
- private LocalDate planStartTime;
+ private String planStartTime;
- @Schema(description = "鍋忕鍗曞彿")
- private String deviation;
- @Schema(description = "鏄惁涓存椂娴佺▼锛屽��:Y/N")
- private String isTempFlow;
+ @Schema(description = "涓存椂鏇存敼鍗曞彿")
+ private String dviateCode;
- @Schema(description = "浠诲姟娲惧伐璁板綍琛╥d")
- private Long taskDispatchId;
-
- @Schema(description = "浜哄憳鑱岃矗琛╥d锛岀晫闈笂闆朵欢鍙峰尮閰嶄笉涓婄敤鎴锋寚瀹氱殑")
- private Long producePlanId;
-
- @Schema(description = "MES浠诲姟鍞竴鏍囪瘑")
- private String mesTaskId;
- /**
- * 鏄惁 鏈� 绋嬪簭琛ュ厖娴佺▼锛堜复鏃舵祦绋嬶級
- * @return 鏄惁
- */
- public boolean isTemporaryFlow(){
- return FlowContants.Y.equals(isTempFlow);
- }
-
- /**
- * 鏄惁鍋忕鍗�
- * @return 鏄惁
- */
- public boolean isDeviationFlow(){
- return StringUtils.isNotBlank(deviation);
- }
}
--
Gitblit v1.9.3