diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java index 6c25a282..39851902 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java @@ -128,13 +128,13 @@ public class WmsInspectionTensileDetail extends BaseEntity { */ private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - private String bendTest90; + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - private String bendTest180; + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java index 3584fdb0..ffce19e1 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java @@ -175,14 +175,14 @@ public class WmsInspectionTensileDetailBo extends BaseEntity { private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - private String bendTest90; + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - private String bendTest180; + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java index 01217839..7dd60112 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java @@ -182,16 +182,16 @@ public class WmsInspectionTensileDetailVo { private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - @ExcelProperty(value = "弯曲试验 90° 结果") - private String bendTest90; + @ExcelProperty(value = "弯曲试验 结果") + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - @ExcelProperty(value = "弯曲试验 180° 结果") - private String bendTest180; + @ExcelProperty(value = "弯曲试验 反向弯曲 结果") + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java index 417a0466..b10281de 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java @@ -90,8 +90,8 @@ public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTens lqw.eq(bo.getCoatingWeightBottom() != null, WmsInspectionTensileDetail::getCoatingWeightBottom, bo.getCoatingWeightBottom()); lqw.eq(bo.getCoatingWeightAvg() != null, WmsInspectionTensileDetail::getCoatingWeightAvg, bo.getCoatingWeightAvg()); lqw.eq(bo.getRoughness() != null, WmsInspectionTensileDetail::getRoughness, bo.getRoughness()); - lqw.eq(StringUtils.isNotBlank(bo.getBendTest90()), WmsInspectionTensileDetail::getBendTest90, bo.getBendTest90()); - lqw.eq(StringUtils.isNotBlank(bo.getBendTest180()), WmsInspectionTensileDetail::getBendTest180, bo.getBendTest180()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTest()), WmsInspectionTensileDetail::getBendTest, bo.getBendTest()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTestReverse()), WmsInspectionTensileDetail::getBendTestReverse, bo.getBendTestReverse()); lqw.eq(StringUtils.isNotBlank(bo.getBendTestDirection()), WmsInspectionTensileDetail::getBendTestDirection, bo.getBendTestDirection()); lqw.eq(bo.getCuppingValue() != null, WmsInspectionTensileDetail::getCuppingValue, bo.getCuppingValue()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), WmsInspectionTensileDetail::getSurfaceStructure, bo.getSurfaceStructure()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml index 5c6b2807..57c827af 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml @@ -31,8 +31,8 @@ - - + +