From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index cb93426..3256d5b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -42,11 +42,7 @@
@Excel(name = "鍗曚綅")
private String unit;
- /**
- * 鐢熶骇鐐掓満
- */
- @Excel(name = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
@@ -63,6 +59,7 @@
@TableField(exist = false)
private LocalDateTime createTime;
+
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -70,4 +67,16 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @TableField(exist = false)
+ private Long topProductParentId;
+
+
+ @ApiModelProperty(value = "鍗曚环")
+ @Excel(name = "鍗曚环")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "搴撳瓨棰勮鍊�")
+ @Excel(name = "搴撳瓨棰勮鍊�")
+ private BigDecimal stockWarningValue;
}
--
Gitblit v1.9.3