From 4ca4444ad33a2a1a51f5c06e78ee9365dfb1eed6 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 17:11:11 +0800
Subject: [PATCH] feat(mes): 种子二维码标签国标四要素合规改造
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/pub/trace/vo/MesProTracePublicRespVO.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 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 6f5d570..060ca21 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
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.controller.pub.trace.vo;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchFlowRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchProcessTraceRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPurchaseSourceRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchSalesTargetRespVO;
@@ -14,7 +15,7 @@
* H5 鎵爜婧簮 - 鍏ㄧ▼婧簮淇℃伅 Response VO
* <p>
* 浠ャ�屼俊鎭尯鍧椼�嶆ā鍧楀寲缁勭粐锛屾牳蹇冧俊鎭紙鍝佺/鎵规/浜哄憳/璐ㄦ/鍏ュ簱锛夊缁堣繑鍥烇紱
- * 閲囪喘鏉ユ簮銆侀攢鍞幓鍚戙�佸姞宸ユ祦杞负鍙�夋墿灞曞尯鍧楋紙鏈夋暟鎹墠闈炵┖锛夈�傚悗缁柊澧炴暟鎹簮鎸夊悓涓�妯″紡杩藉姞鍖哄潡瀛楁銆�
+ * 閲囪喘鏉ユ簮銆侀攢鍞幓鍚戙�佺瀛愭祦鍚戯紙鎵规鍑哄叆搴撴祦姘达級銆佸姞宸ユ祦杞负鍙�夋墿灞曞尯鍧楋紙鏈夋暟鎹墠闈炵┖锛夈�傚悗缁柊澧炴暟鎹簮鎸夊悓涓�妯″紡杩藉姞鍖哄潡瀛楁銆�
*/
@Schema(description = "H5 鎵爜婧簮 - 鍏ㄧ▼婧簮淇℃伅 Response VO")
@Data
@@ -23,8 +24,24 @@
@Schema(description = "杩芥函鍏ュ彛绫诲瀷锛欱AG-琚嬬爜 / PALLET-鎵樼洏鐮� / BATCH-鎵规鐮�", example = "BAG")
private String sourceType;
- @Schema(description = "璇锋眰鐨勮拷婧爜锛堝師濮嬫壂鐮佸�硷級", example = "PC20260828twoITEM_001")
+ @Schema(description = "璇锋眰鐨勮拷婧爜锛堝師濮嬫壂鐮佸�硷級", example = "0286267849370923")
private String requestCode;
+
+ @Schema(description = "杩芥函鐮佹湁鏁堟�э細VALID-鏈夋晥 / CANCELED-宸蹭綔搴燂紙浣滃簾鐮佷笉寰椾綔涓烘湁鏁堜骇鍝佹祦閫氾級",
+ example = "VALID")
+ private String codeStatus;
+
+ @Schema(description = "鏄惁宸插綍鍏ョ敓浜ф壒娆★紙false 琛ㄧず琚嬬爜/鎵樼洏宸茬敓鎴愪絾灏氭湭褰曞叆鎵规锛屾鏃朵粎杩斿洖鍝佺淇℃伅锛�", example = "true")
+ private Boolean batchBound;
+
+ // ====== 鏍囩鍥涜绱犲尯鍧楋紙涓庝簩缁寸爜鏍囩鍗板埛鍐呭淇濇寔涓�鑷达級 ======
+ @Schema(description = "鐢熶骇缁忚惀鑰呭悕绉帮紙杩涘彛绉嶅瓙鍦烘櫙涓鸿繘鍙ｅ晢鍚嶇О锛�",
+ example = "鏂扮枂濉旈噷鏈ㄦ渤绉嶄笟鑲′唤鏈夐檺鍏徃")
+ private String operatorName;
+
+ @Schema(description = "杩芥函缃戝潃锛堜笌浜岀淮鐮佸唴瀹瑰墠缂�涓�鑷达級",
+ example = "http://1.95.78.124:9008/prod/trace.html")
+ private String traceUrl;
// ====== 鍝佺淇℃伅鍖哄潡 ======
@Schema(description = "鍝佺缂栫爜")
@@ -35,6 +52,9 @@
@Schema(description = "鍝佺瑙勬牸")
private String itemSpecification;
+
+ @Schema(description = "鍝佺璁￠噺鍗曚綅鍚嶇О", example = "48鍗冨厠")
+ private String itemUnitMeasureName;
// ====== 鐢熶骇鎵规淇℃伅鍖哄潡 ======
@Schema(description = "鎵规鍙�")
@@ -116,9 +136,50 @@
@Schema(description = "閿�鍞幓鍚戯紙鍙�夛級")
private List<MesWmBatchSalesTargetRespVO> salesTargets;
+ @Schema(description = "绉嶅瓙娴佸悜淇℃伅锛堟壒娆″嚭鍏ュ簱娴佹按锛氱敓浜у叆搴� 鈫� 閿�鍞嚭搴撶瓑锛屽彲閫夛級")
+ private List<MesWmBatchFlowRespVO> seedFlows;
+
@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
public static class WorkerVO {
--
Gitblit v1.9.3