From 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 02 九月 2026 14:24:38 +0800
Subject: [PATCH] refactor(mes): 优化MES生产扫码入库功能支持多类型扫码
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java
index 50c395a..bf9329f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java
@@ -105,6 +105,10 @@
@Schema(description = "绉嶅瓙璐ㄦ淇℃伅")
private QualityVO quality;
+ // ====== 闃蹭吉楠岃瘉鍖哄潡 ======
+ @Schema(description = "闃蹭吉楠岃瘉淇℃伅锛堣杩芥函鐮佹壂鐮佹鏁颁笌鏃堕棿锛�")
+ private AntiFakeVO antiFake;
+
// ====== 鍙�夋墿灞曞尯鍧楋紙鏈夋暟鎹墠杩斿洖锛岀┖琛ㄨ繑鍥炵┖鍒楄〃锛� ======
@Schema(description = "閲囪喘鏉ユ簮锛堝彲閫夛級")
private List<MesWmBatchPurchaseSourceRespVO> purchaseSources;
@@ -114,6 +118,44 @@
@Schema(description = "鍔犲伐娴佽浆锛堝彲閫夛級")
private List<MesWmBatchProcessTraceRespVO> processTraces;
+
+ @Schema(description = "杩芥函鏃堕棿绾�")
+ private List<TimelineVO> timeline;
+
+ @Schema(description = "杩芥函鍐崇瓥鎽樿")
+ private DecisionVO decision;
+
+ @Schema(description = "杩芥函鏃堕棿绾夸簨浠�")
+ @Data
+ public static class TimelineVO {
+ @Schema(description = "闃舵")
+ private String stage;
+ @Schema(description = "浜嬩欢绫诲瀷")
+ private String eventType;
+ @Schema(description = "浜嬩欢鍚嶇О")
+ private String eventName;
+ @Schema(description = "浜嬩欢鏃堕棿")
+ private LocalDateTime eventTime;
+ @Schema(description = "鏁伴噺")
+ private BigDecimal quantity;
+ @Schema(description = "鐘舵��")
+ private String status;
+ }
+
+ @Schema(description = "杩芥函鍐崇瓥鎽樿")
+ @Data
+ public static class DecisionVO {
+ @Schema(description = "璐ㄩ噺鏄惁瀛樺湪椋庨櫓")
+ private Boolean qualityRisk;
+ @Schema(description = "搴撳瓨鍏ュ簱鏁伴噺")
+ private BigDecimal inboundQuantity;
+ @Schema(description = "閿�鍞幓鍚戞暟閲�")
+ private Integer salesTargetCount;
+ @Schema(description = "娑堣垂鑰呮壂鐮佹鏁�")
+ private Long consumerScanCount;
+ @Schema(description = "椋庨櫓绛夌骇")
+ private String riskLevel;
+ }
@Schema(description = "鐢熶骇浜哄憳")
@Data
@@ -175,6 +217,17 @@
private LocalDateTime eventTime;
}
+ @Schema(description = "闃蹭吉楠岃瘉淇℃伅")
+ @Data
+ public static class AntiFakeVO {
+ @Schema(description = "璇ヨ拷婧爜绱鎵爜娆℃暟", example = "3")
+ private Long scanCount;
+ @Schema(description = "棣栨鎵爜鏃堕棿")
+ private LocalDateTime firstScanTime;
+ @Schema(description = "鏈�杩戞壂鐮佹椂闂�")
+ private LocalDateTime lastScanTime;
+ }
+
@Schema(description = "绉嶅瓙璐ㄦ淇℃伅")
@Data
public static class QualityVO {
--
Gitblit v1.9.3