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/ProductionOrderPick.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index a15270c..0449c4f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -46,6 +46,9 @@
@Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟id锛堝伐搴忎换鍔★級锛岄鏂欏綊灞炵殑宸ュ簭鎵ц鍗曞厓")
+ private Long productionOperationTaskId;
+
@Schema(description = "澶囨敞")
private String remark;
@@ -66,6 +69,19 @@
@Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
+ @Schema(description = "琛ユ枡鎬婚噺")
+ private BigDecimal feedingQty;
+
+ @Schema(description = "閫�鏂欐暟閲�")
+ private BigDecimal returnQty;
+
+ @Schema(description = "瀹為檯鏁伴噺")
+ private BigDecimal actualQty;
+
+ @Schema(description = "鏄惁宸查��鏂�")
+ @TableField("is_returned")
+ private Boolean returned;
+
@Schema(description = "鏄惁bom棰嗘枡")
@TableField("is_bom")
private Boolean bom;
--
Gitblit v1.9.3