From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/pojo/ProductBomHistory.java | 238 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 164 insertions(+), 74 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/ProductBomHistory.java b/src/main/java/com/whyc/pojo/ProductBomHistory.java
index d5705a1..698b3e9 100644
--- a/src/main/java/com/whyc/pojo/ProductBomHistory.java
+++ b/src/main/java/com/whyc/pojo/ProductBomHistory.java
@@ -6,60 +6,110 @@
import org.apache.ibatis.type.Alias;
import java.util.Date;
+import java.util.List;
/**
* 浜у搧bom琛ㄥ巻鍙茶褰�
*/
-@TableName(schema = "db_doc",value = "tb_product_bom_history")
+@TableName(value = "tb_product_bom_history")
@Alias("ProductBomHistory")
public class ProductBomHistory {
private Integer id;
- @ApiModelProperty("姣嶆枡缂栧彿")
- private String parentCode;
- @ApiModelProperty("姣嶆枡鍚嶇О")
- private String parentName;
- @ApiModelProperty("姣嶆枡鍨嬪彿")
- private String parentModel;
+ @ApiModelProperty("浜у搧id")
+ private Integer productId;
+ @ApiModelProperty("鐗╂枡id")
+ private Integer materialId;
+ @ApiModelProperty("bom璧峰鐗堟湰")
+ private Integer subSVersion;
+ @ApiModelProperty("bom缁堟鐗堟湰")
+ private Integer subEVersion;
+
+ @ApiModelProperty("鐗╂枡瀹炰綋绫�")
+ @TableField(exist = false)
+ private Material materialObj;
+
@ApiModelProperty("缁撴瀯浠剁被鍨�")
+ @TableField(exist = false)
private String type;
+
@ApiModelProperty("绫诲埆")
private String category;
+
@ApiModelProperty("瀛愪欢缂栫爜")
+ @TableField(exist = false)
private String subCode;
+
@ApiModelProperty("瀛愪欢鍚嶇О")
+ @TableField(exist = false)
private String subName;
+
@ApiModelProperty("瀛愪欢鍨嬪彿")
+ @TableField(exist = false)
private String subModel;
+
@ApiModelProperty("鍗曚綅")
+ @TableField(exist = false)
private String unit;
+
@ApiModelProperty("瀛愪欢鏁伴噺")
private Integer quantity;
+
@ApiModelProperty("鐢熶骇鍟�")
private String producer;
+
+ @ApiModelProperty("鍘傚瑙勬牸")
+ private String producerSpecification;
+
@ApiModelProperty("灏佽绫诲瀷/鏉愯川")
private String material;
+
@ApiModelProperty("鍏冧欢缂栧彿/鏂欏帤")
private String thickness;
+
@ApiModelProperty("琛ㄩ潰澶勭悊/鐗╂枡璇︽儏")
private String surfaceDetail;
+
@ApiModelProperty("澶囨敞")
private String notes;
- private String pictureUrl;
- private String fileUrl;
- @ApiModelProperty("涓婁紶浜�")
- private Long upUserId;
+
+ @TableField(exist = false)
private Date createDate;
- //private Date updateDate;
- @ApiModelProperty("璧峰鐗堟湰鍙�")
- private Integer sVersion;
- @ApiModelProperty("缁堟鐗堟湰鍙�")
- private Integer eVersion;
- @ApiModelProperty("姣嶆枡鐗堟湰鍙�(浜у搧鐗堟湰鍙�)")
- private String parentVersion;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐗堟湰鍙�")
+ private Integer version;
@ApiModelProperty("宸ョ▼鍥剧焊url")
+ @TableField(exist = false)
private String dwgUrl;
+
+ @TableField(exist = false)
+ private String pictureUrl;
+
+ @TableField(exist = false)
+ private String fileUrl;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏宠仈鐨勭墿鏂欓泦鍚�")
+ private List<Material> materials;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏宠仈鐨勭墿鏂欓泦鍚�")
+ private List<Software> softwares;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "姣嶆枡缂栧彿")
+ private String parentCode;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹氬埗鍗曞彿")
+ private String customCode;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁鏄痓om鐨勭鐞嗭紝excel瀵煎嚭鏈夌敤锛�0锛氬師浠讹紝1锛氬叧鑱斾欢")
+ private Integer connFlag;
+
public Integer getId() {
return id;
@@ -67,30 +117,6 @@
public void setId(Integer id) {
this.id = id;
- }
-
- public String getParentCode() {
- return parentCode;
- }
-
- public void setParentCode(String parentCode) {
- this.parentCode = parentCode;
- }
-
- public String getParentName() {
- return parentName;
- }
-
- public void setParentName(String parentName) {
- this.parentName = parentName;
- }
-
- public String getParentModel() {
- return parentModel;
- }
-
- public void setParentModel(String parentModel) {
- this.parentModel = parentModel;
}
public String getType() {
@@ -205,14 +231,6 @@
this.fileUrl = fileUrl;
}
- public Long getUpUserId() {
- return upUserId;
- }
-
- public void setUpUserId(Long upUserId) {
- this.upUserId = upUserId;
- }
-
public Date getCreateDate() {
return createDate;
}
@@ -221,30 +239,6 @@
this.createDate = createDate;
}
- public Integer getSVersion() {
- return sVersion;
- }
-
- public void setSVersion(Integer sVersion) {
- this.sVersion = sVersion;
- }
-
- public Integer getEVersion() {
- return eVersion;
- }
-
- public void setEVersion(Integer eVersion) {
- this.eVersion = eVersion;
- }
-
- public String getParentVersion() {
- return parentVersion;
- }
-
- public void setParentVersion(String parentVersion) {
- this.parentVersion = parentVersion;
- }
-
public String getDwgUrl() {
return dwgUrl;
}
@@ -252,4 +246,100 @@
public void setDwgUrl(String dwgUrl) {
this.dwgUrl = dwgUrl;
}
+
+ public Integer getProductId() {
+ return productId;
+ }
+
+ public void setProductId(Integer productId) {
+ this.productId = productId;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ public List<Material> getMaterials() {
+ return materials;
+ }
+
+ public void setMaterials(List<Material> materials) {
+ this.materials = materials;
+ }
+
+ public List<Software> getSoftwares() {
+ return softwares;
+ }
+
+ public void setSoftwares(List<Software> softwares) {
+ this.softwares = softwares;
+ }
+
+ public String getParentCode() {
+ return parentCode;
+ }
+
+ public void setParentCode(String parentCode) {
+ this.parentCode = parentCode;
+ }
+
+ public String getCustomCode() {
+ return customCode;
+ }
+
+ public void setCustomCode(String customCode) {
+ this.customCode = customCode;
+ }
+
+ public Integer getMaterialId() {
+ return materialId;
+ }
+
+ public void setMaterialId(Integer materialId) {
+ this.materialId = materialId;
+ }
+
+ public Integer getSubSVersion() {
+ return subSVersion;
+ }
+
+ public void setSubSVersion(Integer subSVersion) {
+ this.subSVersion = subSVersion;
+ }
+
+ public Integer getSubEVersion() {
+ return subEVersion;
+ }
+
+ public void setSubEVersion(Integer subEVersion) {
+ this.subEVersion = subEVersion;
+ }
+
+ public Material getMaterialObj() {
+ return materialObj;
+ }
+
+ public void setMaterialObj(Material materialObj) {
+ this.materialObj = materialObj;
+ }
+
+ public Integer getConnFlag() {
+ return connFlag;
+ }
+
+ public void setConnFlag(Integer connFlag) {
+ this.connFlag = connFlag;
+ }
+
+ public String getProducerSpecification() {
+ return producerSpecification;
+ }
+
+ public void setProducerSpecification(String producerSpecification) {
+ this.producerSpecification = producerSpecification;
+ }
}
--
Gitblit v1.9.1