From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
index b4fa6a8..4f0dc49 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPickRecord.java
@@ -1,10 +1,8 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-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 java.io.Serializable;
import java.math.BigDecimal;
@@ -18,61 +16,63 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_order_pick_record")
-@ApiModel(value = "ProductionOrderPickRecord瀵硅薄", description = "绾胯竟浠撳嚭鍏ュ簱璁板綍")
+@Schema(name = "ProductionOrderPickRecord瀵硅薄", description = "绾胯竟浠撳嚭鍏ュ簱璁板綍")
public class ProductionOrderPickRecord implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭id")
+ @Schema(description = "涓婚敭id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈棰嗘枡鍗昳d锛坧roduction_order_pick.id锛�")
+ @Schema(description = "鍏宠仈棰嗘枡鍗昳d锛坧roduction_order_pick.id锛�")
private Long pickId;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("鐢熶骇宸ュ崟id")
+ @Schema(description = "鐢熶骇宸ュ崟id")
private Long productionOperationTaskId;
- @ApiModelProperty("浜у搧瑙勬牸id")
- private Integer productModelId;
+ @Schema(description = "浜у搧瑙勬牸id")
+ private Long productModelId;
- @ApiModelProperty("鎵瑰彿")
+ @Schema(description = "鎵瑰彿")
private String batchNo;
- @ApiModelProperty("棰嗘枡鏁伴噺")
+ @Schema(description = "棰嗘枡鏁伴噺")
private BigDecimal pickQuantity;
- @ApiModelProperty("棰嗘枡鍓嶆暟閲�")
+ @Schema(description = "棰嗘枡鍓嶆暟閲�")
private BigDecimal beforeQuantity;
- @ApiModelProperty("棰嗘枡鍚庡墿浣欐暟閲�")
+ @Schema(description = "棰嗘枡鍚庡墿浣欐暟閲�")
private BigDecimal afterQuantity;
- @ApiModelProperty("棰嗘枡绫诲瀷锛�1姝ｅ父棰嗘枡 2琛ユ枡")
+ @Schema(description = "棰嗘枡绫诲瀷锛�1姝ｅ父棰嗘枡 2琛ユ枡")
private Byte pickType;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "琛ユ枡鍘熷洜")
+ private String feedingReason;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
--
Gitblit v1.9.3