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/TechnologyBomStructureDto.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
index cb2228a..700b4d4 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyBomStructureDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.technology.bean.dto;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,21 +11,22 @@
@EqualsAndHashCode(callSuper = true)
public class TechnologyBomStructureDto extends TechnologyBomStructure {
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String operationName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧ID")
+ @Schema(description = "浜у搧ID")
private Long productId;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- private String tempId;
-
- private String parentTempId;
-
- private List<TechnologyBomStructureDto> children;
+ /**
+ * BOM 鍙淮鎶ゆ墎骞崇殑鈥滅墿鏂欒鏍� + 娑堣�楀伐搴忊�濆叧绯伙紝涓嶅啀鏈夊眰绾у拰鏁伴噺銆�
+ * 鏄庣粏椤瑰彧闇�瑕� id锛堟洿鏂版椂锛夈�乸roductModelId銆乷perationId銆�
+ */
+ @Schema(description = "鎵佸钩鐗╂枡鏄庣粏鍒楄〃")
+ private List<TechnologyBomStructureDto> detailList;
}
--
Gitblit v1.9.3