From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index eb0ef6d..b7809c8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -30,6 +30,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @Schema(description = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
+ private Long salesLedgerProductId;
+
@Schema(description = "涓荤敓浜ц鍒掑彿")
private String mpsNo;
@@ -55,6 +61,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+ @Schema(description = "閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
@Schema(description = "浜у搧鍨嬪彿id")
private Long productModelId;
@@ -64,7 +74,7 @@
@Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
- @Schema(description = "鏉ユ簮")
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
@Schema(description = "瀹℃牳鐘舵��")
@@ -72,9 +82,6 @@
@Schema(description = "鎵胯鏃ユ湡")
private LocalDate promisedDeliveryDate;
-
- @Schema(description = "鐢宠鍗曠紪鍙�")
- private String applyNo;
@Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
private Integer status;
--
Gitblit v1.9.3