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/ProductionOrder.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index c07b320..9e29fe8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -21,10 +19,9 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_order")
-@ApiModel(value = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
+@Schema(name = "ProductionOrder瀵硅薄", description = "鐢熶骇璁㈠崟琛�")
public class ProductionOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,60 +29,51 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閿�鍞彴璐d")
- private Long salesLedgerId;
-
- @ApiModelProperty("鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
+ @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id銆傛墜鍔ㄦ柊澧炴椂蹇呭～锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private Long productModelId;
- @ApiModelProperty("鐢熶骇璁㈠崟鍙�")
+ @Schema(description = "鐢熶骇璁㈠崟鍙�")
private String npsNo;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id銆傛柊澧炴椂閫夊～锛屼笉浼犲垯绯荤粺鎸変骇鍝佽鏍艰嚜鍔ㄥ尮閰嶆渶鏂板伐鑹鸿矾绾裤��")
private Long technologyRoutingId;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲忋�傛墜鍔ㄦ柊澧炴椂蹇呭～涓斿繀椤诲ぇ浜� 0锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private BigDecimal quantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Schema(description = "寮�濮嬫棩鏈�")
private LocalDateTime startTime;
- @ApiModelProperty("缁撴潫鏃ユ湡")
+ @Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
- @ApiModelProperty("閿�鍞骇鍝佽鏍糹d")
- private Integer saleLedgerProductId;
-
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- @ApiModelProperty(value = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ @Schema(description = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
private Integer status;
-
- @ApiModelProperty("寮哄害")
- private String strength;
}
--
Gitblit v1.9.3