- 添加 BatchInspectionMainBo 和 BatchInspectionTensileBo 数据传输对象 - 集成检验明细列表到 WmsInspectionMainBo 和 WmsInspectionTensileDetailBo - 在 inspectionMain 控制器中实现批量插入检验主数据接口 - 在 inspectionTensileDetail 控制器中实现批量插入拉伸试验明细接口 - 重构前端检验样品页面,合并主表和明细表的保存操作 - 优化前端拉伸试验页面的批量新增逻辑,统一使用批量插入接口 - 更新服务层实现以支持批量插入并更新申请单关联ID列表 - 移除前端页面中单独的明细表增删改操作接口调用
276 lines
4.5 KiB
Java
276 lines
4.5 KiB
Java
package com.klp.domain.bo;
|
||
|
||
import com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
import lombok.EqualsAndHashCode;
|
||
import javax.validation.constraints.*;
|
||
|
||
import java.math.BigDecimal;
|
||
import java.util.Date;
|
||
import java.util.List;
|
||
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
|
||
/**
|
||
* 金属材料室温拉伸试验样品明细业务对象 wms_inspection_tensile_detail
|
||
*
|
||
* @author klp
|
||
* @date 2026-06-13
|
||
*/
|
||
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
public class WmsInspectionTensileDetailBo extends BaseEntity {
|
||
|
||
/**
|
||
* 样品明细主键ID,自增
|
||
*/
|
||
private String detailId;
|
||
|
||
/**
|
||
* 关联主表试验记录ID
|
||
*/
|
||
private String testMainId;
|
||
|
||
/**
|
||
* 样品编号
|
||
*/
|
||
private String sampleNo;
|
||
|
||
/**
|
||
* 钢卷号
|
||
*/
|
||
private String steelCoilNo;
|
||
|
||
/**
|
||
* 原料号
|
||
*/
|
||
private String rawMaterialNo;
|
||
|
||
/**
|
||
* 规格(宽*厚)
|
||
*/
|
||
private String specification;
|
||
|
||
/**
|
||
* 材质/钢种
|
||
*/
|
||
private String material;
|
||
|
||
/**
|
||
* 原料厂家
|
||
*/
|
||
private String rawMaterialFactory;
|
||
|
||
/**
|
||
* 生产班组
|
||
*/
|
||
private String productionTeam;
|
||
|
||
/**
|
||
* 表面状态
|
||
*/
|
||
private String surfaceStatus;
|
||
|
||
/**
|
||
* 生产日期
|
||
*/
|
||
private Date productionDate;
|
||
|
||
/**
|
||
* 生产日期开始(用于范围筛选)
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date productionDateStart;
|
||
|
||
/**
|
||
* 生产日期结束(用于范围筛选)
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date productionDateEnd;
|
||
|
||
/**
|
||
* 试验日期
|
||
*/
|
||
private Date testDate;
|
||
|
||
/**
|
||
* 试验日期开始(用于范围筛选)
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date testDateStart;
|
||
|
||
/**
|
||
* 试验日期结束(用于范围筛选)
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date testDateEnd;
|
||
|
||
/**
|
||
* 试样方向(纵/横)
|
||
*/
|
||
private String sampleDirection;
|
||
|
||
/**
|
||
* 试样尺寸(宽*厚)mm
|
||
*/
|
||
private String sampleSize;
|
||
|
||
/**
|
||
* 原始标距 mm
|
||
*/
|
||
private BigDecimal originalGaugeLength;
|
||
|
||
/**
|
||
* 断后标距 mm
|
||
*/
|
||
private BigDecimal fractureGaugeLength;
|
||
|
||
/**
|
||
* 最大力 KN
|
||
*/
|
||
private BigDecimal maxForce;
|
||
|
||
/**
|
||
* 下屈服强度 ReL Mpa
|
||
*/
|
||
private BigDecimal lowerYieldStrength;
|
||
|
||
/**
|
||
* 抗拉强度 Rm Mpa
|
||
*/
|
||
private BigDecimal tensileStrength;
|
||
|
||
/**
|
||
* 伸长率 A %
|
||
*/
|
||
private BigDecimal elongation;
|
||
|
||
/**
|
||
* 硬度 HR/HRB/HR30T
|
||
*/
|
||
private BigDecimal hardnessHr;
|
||
|
||
/**
|
||
* 硬度 HV
|
||
*/
|
||
private BigDecimal hardnessHv;
|
||
|
||
/**
|
||
* 镀层重量 上表面3点均值 g/m2
|
||
*/
|
||
private BigDecimal coatingWeightTop;
|
||
|
||
/**
|
||
* 镀层重量 下表面3点均值 g/m2
|
||
*/
|
||
private BigDecimal coatingWeightBottom;
|
||
|
||
/**
|
||
* 镀层重量 双面3点平均 g/m2
|
||
*/
|
||
private BigDecimal coatingWeightAvg;
|
||
|
||
/**
|
||
* 粗糙度 um
|
||
*/
|
||
private BigDecimal roughness;
|
||
|
||
/**
|
||
* 弯曲试验 结果
|
||
*/
|
||
private String bendTest;
|
||
|
||
/**
|
||
* 弯曲试验 反向弯曲 结果
|
||
*/
|
||
private String bendTestReverse;
|
||
|
||
/**
|
||
* 弯曲试验 方向(横向/纵向)
|
||
*/
|
||
private String bendTestDirection;
|
||
|
||
/**
|
||
* 杯突值 mm
|
||
*/
|
||
private BigDecimal cuppingValue;
|
||
|
||
/**
|
||
* 表面结构
|
||
*/
|
||
private String surfaceStructure;
|
||
|
||
/**
|
||
* 边缘状态
|
||
*/
|
||
private String edgeStatus;
|
||
|
||
/**
|
||
* 表面质量
|
||
*/
|
||
private String surfaceQuality;
|
||
|
||
/**
|
||
* 镀层表面盐雾试验结果
|
||
*/
|
||
private String saltSprayTest;
|
||
|
||
/**
|
||
* 表面处理
|
||
*/
|
||
private String surfaceTreatment;
|
||
|
||
/**
|
||
* 后处理
|
||
*/
|
||
private String postTreatment;
|
||
|
||
/**
|
||
* 下道工序
|
||
*/
|
||
private String nextProcess;
|
||
|
||
/**
|
||
* 化学成分 C %
|
||
*/
|
||
private BigDecimal cContent;
|
||
|
||
/**
|
||
* 化学成分 Si %
|
||
*/
|
||
private BigDecimal siContent;
|
||
|
||
/**
|
||
* 化学成分 Mn %
|
||
*/
|
||
private BigDecimal mnContent;
|
||
|
||
/**
|
||
* 化学成分 P %
|
||
*/
|
||
private BigDecimal pContent;
|
||
|
||
/**
|
||
* 化学成分 S %
|
||
*/
|
||
private BigDecimal sContent;
|
||
|
||
/**
|
||
* 化学成分 Al %
|
||
*/
|
||
private BigDecimal alContent;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
private String remark;
|
||
|
||
|
||
/**
|
||
* 试验样品明细列表
|
||
*/
|
||
private List<WmsInspectionTensileDetailBo> detailList;
|
||
|
||
}
|