From 66db1d15cf5d4b51a346a42b66f0505bd7f31ce0 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 03 一月 2024 15:23:47 +0800
Subject: [PATCH] 解压
---
src/main/java/com/whyc/pojo/WorksheetMain.java | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/WorksheetMain.java b/src/main/java/com/whyc/pojo/WorksheetMain.java
index 83764ee..987675e 100644
--- a/src/main/java/com/whyc/pojo/WorksheetMain.java
+++ b/src/main/java/com/whyc/pojo/WorksheetMain.java
@@ -5,13 +5,12 @@
import com.whyc.config.EnumWorksheetType;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-@TableName(schema = "db_doc",value = "tb_worksheet_main")
+@TableName(value = "tb_worksheet_main")
@Alias("WorksheetMain")
public class WorksheetMain {
private Integer id;
@@ -35,6 +34,11 @@
* 1:缁忕悊澶勭悊涓�
* 2:鎬荤粡鐞嗗鐞嗕腑
* 5:褰掓。
+ *
+ * ->鍦ㄦ祦绋嬪崱/SOP涓�
+ * 0:椹冲洖,瀹岀粨
+ * 1:澶勭悊涓�
+ * 5:褰掓。
* */
private Integer status;
@ApiModelProperty("宸ュ崟缁撴潫鎰忚")
@@ -43,7 +47,7 @@
/**
* {@link EnumWorksheetType#getType()}
*/
- @ApiModelProperty("宸ュ崟绫诲瀷:1-bom,2-鏁ｈ浠�,3-bom-鏁ｈ浠�")
+ @ApiModelProperty("宸ュ崟绫诲瀷")
private Integer type;
@ApiModelProperty("娴佺▼鐨勪笅涓鐞嗕汉")
@@ -57,15 +61,31 @@
@TableField(exist = false)
private DocUser createUser;
- @ApiModelProperty("寰呭鎵逛骇鍝乥om")
+ @ApiModelProperty("寰呭鎵逛骇鍝�")
@TableField(exist = false)
- private List<ProductBomApproving> approvingBomList;
+ private ProductApproving productApproving;
@TableField(exist = false)
private LinkedList<WorksheetLink> links;
@TableField(exist = false)
private DocUser approvingUser;
+
+ @ApiModelProperty("寰呭鎵圭墿鏂�")
+ @TableField(exist = false)
+ private List<MaterialApproving> mApprovingList;
+
+ @TableField(exist = false)
+ private List<MaterialProductApproving> mpApprovingList;
+
+ @TableField(exist = false)
+ private ProcedureDoc procedureDoc;
+
+ @TableField(exist = false)
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ private Integer pageSize;
public Integer getId() {
return id;
@@ -179,12 +199,12 @@
this.links = links;
}
- public List<ProductBomApproving> getApprovingBomList() {
- return approvingBomList;
+ public ProductApproving getProductApproving() {
+ return productApproving;
}
- public void setApprovingBomList(List<ProductBomApproving> approvingBomList) {
- this.approvingBomList = approvingBomList;
+ public void setProductApproving(ProductApproving productApproving) {
+ this.productApproving = productApproving;
}
public DocUser getApprovingUser() {
@@ -202,4 +222,44 @@
public void setType(Integer type) {
this.type = type;
}
+
+ public List<MaterialApproving> getMApprovingList() {
+ return mApprovingList;
+ }
+
+ public void setMApprovingList(List<MaterialApproving> mApprovingList) {
+ this.mApprovingList = mApprovingList;
+ }
+
+ public List<MaterialProductApproving> getMpApprovingList() {
+ return mpApprovingList;
+ }
+
+ public void setMpApprovingList(List<MaterialProductApproving> mpApprovingList) {
+ this.mpApprovingList = mpApprovingList;
+ }
+
+ public ProcedureDoc getProcedureDoc() {
+ return procedureDoc;
+ }
+
+ public void setProcedureDoc(ProcedureDoc procedureDoc) {
+ this.procedureDoc = procedureDoc;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
}
--
Gitblit v1.9.1