From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/production/pojo/ProductionPlan.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 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..86b5f4d 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,26 +61,24 @@
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateUser;
 
+    @Schema(description = "閮ㄩ棬ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
+
     @Schema(description = "浜у搧鍨嬪彿id")
     private Long productModelId;
 
     @Schema(description = "闇�姹傛暟閲�")
     private BigDecimal qtyRequired;
 
-    @Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
-    private Boolean issued;
+    @Schema(description = "宸蹭笅鍙戞暟閲�")
+    private BigDecimal quantityIssued;
 
-    @Schema(description = "鏉ユ簮")
+    @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
     private String source;
-
-    @Schema(description = "瀹℃牳鐘舵��")
-    private String isAudit;
 
     @Schema(description = "鎵胯鏃ユ湡")
     private LocalDate promisedDeliveryDate;
-
-    @Schema(description = "鐢宠鍗曠紪鍙�")
-    private String applyNo;
 
     @Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
     private Integer status;

--
Gitblit v1.9.3