From d88e0057c906d3aa2cef697cc96041c8d750a8da Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 15:11:09 +0800
Subject: [PATCH] material/getMaterialLimit 查询所有物料(分页，模糊查询) 修改带上关联关系和包含物料编码的产品
---
src/main/java/com/whyc/pojo/Material.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/Material.java b/src/main/java/com/whyc/pojo/Material.java
index 350f2cc..e29b778 100644
--- a/src/main/java/com/whyc/pojo/Material.java
+++ b/src/main/java/com/whyc/pojo/Material.java
@@ -55,7 +55,13 @@
private String dwgUrl;
@TableField(exist = false)
- private List<MaterialProductHistory> mProductHistorys;
+ @ApiModelProperty(value = "鐗╂枡涓庝骇鍝佺殑鍏宠仈鍏崇郴")
+ private List<MaterialProductHistory> mproductHistorys;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍖呭惈鐗╂枡缂栫爜鐨勪骇鍝�")
+ private List<Product> products;
+
public Integer getId() {
return id;
@@ -217,11 +223,19 @@
this.status = status;
}
- public List<MaterialProductHistory> getMProductHistorys() {
- return mProductHistorys;
+ public List<MaterialProductHistory> getMproductHistorys() {
+ return mproductHistorys;
}
- public void setMProductHistorys(List<MaterialProductHistory> mProductHistorys) {
- this.mProductHistorys = mProductHistorys;
+ public void setMproductHistorys(List<MaterialProductHistory> mproductHistorys) {
+ this.mproductHistorys = mproductHistorys;
+ }
+
+ public List<Product> getProducts() {
+ return products;
+ }
+
+ public void setProducts(List<Product> products) {
+ this.products = products;
}
}
--
Gitblit v1.9.1