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/BomImportDto.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/BomImportDto.java b/src/main/java/com/ruoyi/technology/bean/dto/BomImportDto.java
index 865a612..c7e1f02 100644
--- a/src/main/java/com/ruoyi/technology/bean/dto/BomImportDto.java
+++ b/src/main/java/com/ruoyi/technology/bean/dto/BomImportDto.java
@@ -3,33 +3,32 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
-import java.math.BigDecimal;
-
+/**
+ * BOM 瀵煎叆瀵煎嚭琛岋細鎵佸钩缁撴瀯锛屼竴琛� = 鎴愬搧 + 涓�涓墿鏂欒鏍� + 璇ョ墿鏂欑殑娑堣�楀伐搴忋��
+ * 涓嶅啀鍖呭惈灞傜骇锛堢埗椤�/瀛愰」锛夊拰鍗曚綅鐢ㄩ噺銆�
+ */
@Data
public class BomImportDto {
- @Excel(name = "鐖堕」浜у搧缂栧彿")
- private String parentCode;
+ @Excel(name = "鎴愬搧浜у搧缂栧彿")
+ private String productCode;
- @Excel(name = "鐖堕」浜у搧鍚嶇О")
- private String parentName;
+ @Excel(name = "鎴愬搧浜у搧鍚嶇О")
+ private String productName;
- @Excel(name = "鐖堕」浜у搧瑙勬牸")
- private String parentSpec;
+ @Excel(name = "鎴愬搧浜у搧瑙勬牸")
+ private String productSpec;
- @Excel(name = "瀛愰」浜у搧缂栧彿")
- private String childCode;
+ @Excel(name = "鐗╂枡浜у搧缂栧彿")
+ private String materialCode;
- @Excel(name = "瀛愰」浜у搧鍚嶇О")
- private String childName;
+ @Excel(name = "鐗╂枡浜у搧鍚嶇О")
+ private String materialName;
- @Excel(name = "瀛愰」浜у搧瑙勬牸")
- private String childSpec;
+ @Excel(name = "鐗╂枡浜у搧瑙勬牸")
+ private String materialSpec;
- @Excel(name = "鍗曚綅鐢ㄩ噺")
- private BigDecimal unitQty;
-
- @Excel(name = "鎶曟枡宸ュ簭")
+ @Excel(name = "娑堣�楀伐搴�")
private String process;
@Excel(name = "澶囨敞")
--
Gitblit v1.9.3