From 1765150bd38a53f6466a6e355f231e21f25fc9f2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 16:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 67e2fde..2889bdd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -1,8 +1,6 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,18 +8,19 @@
import java.time.LocalDateTime;
@Data
+@TableName("production_product_output")
public class ProductionProductOutput {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ュ伐id")
- private Long productionProductId;
+ private Long productMainId;
@ApiModelProperty(value = "浜у搧id")
private Long productModelId;
- @ApiModelProperty(value = "鏁伴噺")
+ @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -30,4 +29,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
}
--
Gitblit v1.9.3