From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 10 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 05d7528..80fd26c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -1,11 +1,16 @@
package com.jcdm.main.da.paramCollection.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
+import java.util.Objects;
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦瀵硅薄 da_param_collection
@@ -13,6 +18,7 @@
* @author yyt
* @date 2023-12-13
*/
+@Data
public class DaParamCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -69,7 +75,7 @@
private Date collectionTime;
/** 棰勭暀瀛楁1 */
- private String spareField1;
+ private String moduleCode;
/** 棰勭暀瀛楁2 */
private String spareField2;
@@ -96,7 +102,91 @@
@Excel(name = "绫诲瀷")
private String type;
- public void setId(Long id)
+ @TableField(exist = false)
+ private String model;
+ @TableField(exist = false)
+ private String productBarcode;
+
+ @TableField(exist = false)
+ private String tightenTheArray;
+
+ @TableField(exist = false)
+ private String productModel;
+
+ @TableField(exist = false)
+ private String yzSfcCode;
+
+ @TableField(exist = false)
+ private String weightValue;
+
+ @TableField(exist = false)
+ private BsFormulaChildInfo formulaChildEntity;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date inboundTime;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date outboundTime;
+
+ @TableField(exist = false)
+ private String screwNumber;
+
+ @TableField(exist = false)
+ private String torque;
+
+ @TableField(exist = false)
+ private String angle;
+
+ @TableField(exist = false)
+ private String torqueResult;
+
+ @TableField(exist = false)
+ private String angleResult;
+
+
+ public Date getInboundTime() {
+ return inboundTime;
+ }
+
+ public void setInboundTime(Date inboundTime) {
+ this.inboundTime = inboundTime;
+ }
+
+ public BsFormulaChildInfo getFormulaChildEntity() {
+ return formulaChildEntity;
+ }
+
+ public void setFormulaChildEntity(BsFormulaChildInfo formulaChildEntity) {
+ this.formulaChildEntity = formulaChildEntity;
+ }
+
+ public String getTightenTheArray() {
+ return tightenTheArray;
+ }
+
+ public void setTightenTheArray(String tightenTheArray) {
+ this.tightenTheArray = tightenTheArray;
+ }
+
+ public String getProductBarcode() {
+ return productBarcode;
+ }
+
+ public void setProductBarcode(String productBarcode) {
+ this.productBarcode = productBarcode;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
@@ -213,16 +303,16 @@
{
return collectionTime;
}
- public void setSpareField1(String spareField1)
- {
- this.spareField1 = spareField1;
+
+ public String getModuleCode() {
+ return moduleCode;
}
- public String getSpareField1()
- {
- return spareField1;
+ public void setModuleCode(String moduleCode) {
+ this.moduleCode = moduleCode;
}
- public void setSpareField2(String spareField2)
+
+ public void setSpareField2(String spareField2)
{
this.spareField2 = spareField2;
}
@@ -302,7 +392,6 @@
.append("paramLower", getParamLower())
.append("paramStandard", getParamStandard())
.append("collectionTime", getCollectionTime())
- .append("spareField1", getSpareField1())
.append("spareField2", getSpareField2())
.append("createUser", getCreateUser())
.append("createTime", getCreateTime())
--
Gitblit v1.9.3