From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录

---
 src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
index af86ada..24611ab 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
@@ -1,10 +1,24 @@
 package com.ruoyi.technology.bean.dto;
 
 import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "TechnologyRoutingOperationDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鏌ヨ鍙傛暟")
+@Schema(name = "TechnologyRoutingOperationDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鏌ヨ鍙傛暟")
 public class TechnologyRoutingOperationDto extends TechnologyRoutingOperation {
+
+    @Schema(description = "宸ヨ壓璺嚎id锛堝吋瀹规棫鍙傛暟 routeId锛�")
+    private Long routeId;
+
+    /**
+     * 宸ヨ壓璺嚎宸ュ簭鍏ㄩ噺淇濆瓨鍒楄〃锛氭寜鎻愪氦椤哄簭浣滀负宸ュ簭椤哄簭锛�
+     * 姣忛」鍙渶瑕� id锛堟洿鏂版椂锛変笌 technologyOperationId銆�
+     */
+    @Schema(description = "宸ヨ壓璺嚎宸ュ簭鍒楄〃锛堝叏閲忎繚瀛橈級")
+    private List<TechnologyRoutingOperationDto> operationList;
 }

--
Gitblit v1.9.3