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/production/pojo/ProductionProductInput.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index 0526bc1..899ed98 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -14,14 +14,14 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @Schema(description = "鎶ュ伐id")
-    private Long productMainId;
-
     @Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
     private Long productionProductMainId;
 
     @Schema(description = "浜у搧id")
     private Long productModelId;
+
+    @Schema(description = "鏉ユ簮棰嗘枡璁板綍id锛坧roduction_order_pick.id锛夛紝淇濊瘉鍚屼竴绗旈鏂欏彧琚竴娆℃姤宸ュ綊闆�")
+    private Long productionOrderPickId;
 
     @Schema(description = "鏁伴噺")
     private BigDecimal quantity;
@@ -37,9 +37,6 @@
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @Schema(description = "绉熸埛ID")
-    @TableField(fill = FieldFill.INSERT)
-    private Long tenantId;
     @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;

--
Gitblit v1.9.3