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 | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index 6ffa6db..86b5f4d 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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+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;
/**
@@ -21,59 +21,65 @@
@Getter
@Setter
@TableName("production_plan")
-@ApiModel(value = "ProductionPlan瀵硅薄", description = "鐢熶骇璁″垝琛�")
+@Schema(name = "ProductionPlan瀵硅薄", description = "鐢熶骇璁″垝琛�")
public class ProductionPlan implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("涓荤敓浜ц鍒掑彿")
+ @Schema(description = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
+ private Long salesLedgerProductId;
+
+ @Schema(description = "涓荤敓浜ц鍒掑彿")
private String mpsNo;
- @ApiModelProperty("闇�姹傛棩鏈�")
- private LocalDateTime requiredDate;
+ @Schema(description = "闇�姹傛棩鏈�")
+ private LocalDate requiredDate;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("浜у搧鍨嬪彿id")
+ @Schema(description = "閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "浜у搧鍨嬪彿id")
private Long productModelId;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal qtyRequired;
- @ApiModelProperty("鐘舵��")
- @TableLogic
- private String state;
+ @Schema(description = "宸蹭笅鍙戞暟閲�")
+ private BigDecimal quantityIssued;
- @ApiModelProperty("鏄惁涓嬪彂鍒堕�犺鍗�")
- private Boolean issued;
-
- @ApiModelProperty("鏉ユ簮")
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
- @ApiModelProperty("瀹℃牳鐘舵��")
- private String isAudit;
+ @Schema(description = "鎵胯鏃ユ湡")
+ private LocalDate promisedDeliveryDate;
- @ApiModelProperty("鎵胯鏃ユ湡")
- private LocalDateTime promisedDeliveryDate;
+ @Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ private Integer status;
}
--
Gitblit v1.9.3