From 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14: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 | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index 868367c..b7809c8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -1,13 +1,13 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -30,11 +30,17 @@
@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;
@Schema(description = "闇�姹傛棩鏈�")
- private LocalDateTime requiredDate;
+ private LocalDate requiredDate;
@Schema(description = "澶囨敞")
private String remark;
@@ -55,30 +61,27 @@
@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 = "鐘舵��")
- @TableLogic
- private String state;
-
@Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
- @Schema(description = "鏉ユ簮")
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
@Schema(description = "瀹℃牳鐘舵��")
private String isAudit;
@Schema(description = "鎵胯鏃ユ湡")
- private LocalDateTime promisedDeliveryDate;
-
- @Schema(description = "鐢宠鍗曠紪鍙�")
- private String applyNo;
+ private LocalDate promisedDeliveryDate;
@Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
private Integer status;
--
Gitblit v1.9.3