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 | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/ProductBomHistory.java b/src/main/java/com/whyc/pojo/ProductBomHistory.java
index ad0b66b..698b3e9 100644
--- a/src/main/java/com/whyc/pojo/ProductBomHistory.java
+++ b/src/main/java/com/whyc/pojo/ProductBomHistory.java
@@ -11,7 +11,7 @@
/**
* 浜у搧bom琛ㄥ巻鍙茶褰�
*/
-@TableName(schema = "db_doc",value = "tb_product_bom_history")
+@TableName(value = "tb_product_bom_history")
@Alias("ProductBomHistory")
public class ProductBomHistory {
@@ -34,7 +34,6 @@
private String type;
@ApiModelProperty("绫诲埆")
- @TableField(exist = false)
private String category;
@ApiModelProperty("瀛愪欢缂栫爜")
@@ -57,23 +56,21 @@
private Integer quantity;
@ApiModelProperty("鐢熶骇鍟�")
- @TableField(exist = false)
private String producer;
+ @ApiModelProperty("鍘傚瑙勬牸")
+ private String producerSpecification;
+
@ApiModelProperty("灏佽绫诲瀷/鏉愯川")
- @TableField(exist = false)
private String material;
@ApiModelProperty("鍏冧欢缂栧彿/鏂欏帤")
- @TableField(exist = false)
private String thickness;
@ApiModelProperty("琛ㄩ潰澶勭悊/鐗╂枡璇︽儏")
- @TableField(exist = false)
private String surfaceDetail;
@ApiModelProperty("澶囨敞")
- @TableField(exist = false)
private String notes;
@TableField(exist = false)
@@ -97,6 +94,9 @@
@ApiModelProperty(value = "鍏宠仈鐨勭墿鏂欓泦鍚�")
private List<Material> materials;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏宠仈鐨勭墿鏂欓泦鍚�")
+ private List<Software> softwares;
@TableField(exist = false)
@ApiModelProperty(value = "姣嶆枡缂栧彿")
@@ -109,6 +109,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鏄惁鏄痓om鐨勭鐞嗭紝excel瀵煎嚭鏈夌敤锛�0锛氬師浠讹紝1锛氬叧鑱斾欢")
private Integer connFlag;
+
public Integer getId() {
return id;
@@ -270,6 +271,13 @@
this.materials = materials;
}
+ public List<Software> getSoftwares() {
+ return softwares;
+ }
+
+ public void setSoftwares(List<Software> softwares) {
+ this.softwares = softwares;
+ }
public String getParentCode() {
return parentCode;
@@ -326,4 +334,12 @@
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