From 6c82f16f44cf9e51d0fae9593fdefe4c43cb5e55 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 06 五月 2026 15:38:38 +0800
Subject: [PATCH] feat:1.生产追溯（订单-工单-报工-质检） 2.订单工序数据查询 3.领料退料调整
---
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
index ecbb0f2..2a0571d 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
@@ -1,6 +1,5 @@
package com.ruoyi.production.bean.vo;
-import com.ruoyi.production.pojo.ProductionOperationTask;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.pojo.ProductionProductOutput;
@@ -13,54 +12,63 @@
import java.util.List;
@Data
-@Schema(name = "ProductionOrderWorkOrderDetailVo", description = "Production order work order/report/inspect detail")
+@Schema(name = "ProductionOrderWorkOrderDetailVo", description = "鐢熶骇杩芥函杩斿洖瀵硅薄")
public class ProductionOrderWorkOrderDetailVo {
- @Schema(description = "Production order info")
+ @Schema(description = "璁㈠崟")
private ProductionOrderVo productionOrder;
- @Schema(description = "Work order list")
+ @Schema(description = "宸ュ崟鏄庣粏鍒楄〃")
private List<WorkOrderDetail> workOrderList;
@Data
- @Schema(name = "WorkOrderDetail", description = "Work order detail")
+ @Schema(name = "WorkOrderDetail", description = "宸ュ崟鏄庣粏")
public static class WorkOrderDetail {
- @Schema(description = "Work order info")
- private ProductionOperationTask workOrder;
+ @Schema(description = "宸ュ崟淇℃伅")
+ private ProductionOperationTaskVo workOrder;
- @Schema(description = "Report list under current work order")
+ @Schema(description = "鎶ュ伐璇︽儏鍒楄〃")
private List<ReportDetail> reportList;
- }
- @Data
- @Schema(name = "ReportDetail", description = "Production report detail")
- public static class ReportDetail {
-
- @Schema(description = "Report main info")
- private ProductionProductMain reportMain;
-
- @Schema(description = "Report output list")
- private List<ProductionProductOutput> reportOutputList;
-
- @Schema(description = "Report process param list")
- private List<ProductionOrderRoutingOperationParam> reportParamList;
-
- @Schema(description = "Inspect list under current report")
+ @Schema(description = "璐ㄦ璇︽儏鍒楄〃")
private List<InspectDetail> inspectList;
}
@Data
- @Schema(name = "InspectDetail", description = "Quality inspect detail")
+ @Schema(name = "ReportDetail", description = "鎶ュ伐璇︽儏")
+ public static class ReportDetail {
+
+ @Schema(description = "鎶ュ伐涓讳俊鎭�")
+ private ProductionProductMain reportMain;
+
+ @Schema(description = "鎶ュ伐浜у嚭鏄庣粏")
+ private List<ProductionProductOutput> reportOutputList;
+
+ @Schema(description = "鎶ュ伐宸ュ簭鍙傛暟")
+ private List<ProductionOrderRoutingOperationParam> reportParamList;
+ }
+
+ @Data
+ @Schema(name = "InspectDetail", description = "璐ㄦ璇︽儏")
public static class InspectDetail {
- @Schema(description = "Inspect main info")
+ @Schema(description = "鎶ュ伐ID")
+ private Long reportId;
+
+ @Schema(description = "鎶ュ伐鍗曞彿")
+ private String reportNo;
+
+ @Schema(description = "鎶ュ伐涓讳俊鎭�")
+ private ProductionProductMain reportMain;
+
+ @Schema(description = "璐ㄦ涓讳俊鎭�")
private QualityInspect inspect;
- @Schema(description = "Inspect param list")
+ @Schema(description = "璐ㄦ鎸囨爣鏄庣粏")
private List<QualityInspectParam> inspectParamList;
- @Schema(description = "Inspect attachment list")
+ @Schema(description = "璐ㄦ闄勪欢鍒楄〃")
private List<QualityInspectFile> inspectFileList;
}
}
--
Gitblit v1.9.3