diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java index c354d46f..a69659a9 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java @@ -5,6 +5,7 @@ import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -37,27 +38,68 @@ public class WmsCoilAbnormal extends BaseEntity { /** * 长度坐标 */ - private String lengthCoord; + private BigDecimal length; + + /** + * 缺陷开始位置 + */ + private BigDecimal startPosition; + + /** + * 缺陷结束位置 + */ + private BigDecimal endPosition; + /** * 缺陷代码(S=表面缺陷、E=边部问题、M=尺寸问题、G=收卷问题) */ private String defectCode; + + /** + * 缺陷类型(更详细的缺陷分类,如划痕、边裂、厚度超标等) + */ + private String defectType; + + /** + * 缺陷率(百分比,如0.05表示5%) + */ + private BigDecimal defectRate; + + /** + * 缺陷重量(单位:kg) + */ + private BigDecimal defectWeight; + /** * 程度(轻微、重度、严重) */ private String degree; + /** * 判级 */ private String judgeLevel; + /** * 判级人 */ private String judgeBy; + /** * 判级时间 */ private Date judgeTime; + + /** + * 主标记(1=是,0=否) + */ + private Integer mainMark; + + /** + * 整卷标记(1=是,0=否) + */ + private Integer wholeCoilMark; + /** * 备注 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java index 89626be6..99aeddae 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -37,13 +38,38 @@ public class WmsCoilAbnormalBo extends BaseEntity { /** * 长度坐标 */ - private String lengthCoord; + private BigDecimal length; + + /** + * 缺陷开始位置 + */ + private BigDecimal startPosition; + + /** + * 缺陷结束位置 + */ + private BigDecimal endPosition; /** * 缺陷代码(S=表面缺陷、E=边部问题、M=尺寸问题、G=收卷问题) */ private String defectCode; + /** + * 缺陷类型(更详细的缺陷分类,如划痕、边裂、厚度超标等) + */ + private String defectType; + + /** + * 缺陷率(百分比,如0.05表示5%) + */ + private BigDecimal defectRate; + + /** + * 缺陷重量(单位:kg) + */ + private BigDecimal defectWeight; + /** * 程度(轻微、重度、严重) */ @@ -64,6 +90,16 @@ public class WmsCoilAbnormalBo extends BaseEntity { */ private Date judgeTime; + /** + * 主标记(1=是,0=否) + */ + private Integer mainMark; + + /** + * 整卷标记(1=是,0=否) + */ + private Integer wholeCoilMark; + /** * 备注 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java index c0f9fcfb..89f3598d 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java @@ -1,5 +1,6 @@ package com.klp.domain.vo; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -43,21 +44,51 @@ public class WmsCoilAbnormalVo { /** * 长度坐标 */ - @ExcelProperty(value = "长度坐标") - private String lengthCoord; + @ExcelProperty(value = "缺陷长度") + private BigDecimal length; + + /** + * 缺陷开始位置 + */ + @ExcelProperty(value = "缺陷开始位置") + private BigDecimal startPosition; + + /** + * 缺陷结束位置 + */ + @ExcelProperty(value = "缺陷结束位置") + private BigDecimal endPosition; /** * 缺陷代码(S=表面缺陷、E=边部问题、M=尺寸问题、G=收卷问题) */ @ExcelProperty(value = "缺陷代码", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "S==表面缺陷、E=边部问题、M=尺寸问题、G=收卷问题") + @ExcelDictFormat(readConverterExp = "S=表面缺陷、E=边部问题、M=尺寸问题、G=收卷问题") private String defectCode; + /** + * 缺陷类型(更详细的缺陷分类,如划痕、边裂、厚度超标等) + */ + @ExcelProperty(value = "缺陷类型") + private String defectType; + + /** + * 缺陷率(百分比,如0.05表示5%) + */ + @ExcelProperty(value = "缺陷率") + private BigDecimal defectRate; + + /** + * 缺陷重量(单位:kg) + */ + @ExcelProperty(value = "缺陷重量") + private BigDecimal defectWeight; + /** * 程度(轻微、重度、严重) */ @ExcelProperty(value = "程度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "轻=微、重度、严重") + @ExcelDictFormat(readConverterExp = "轻微、重度、严重") private String degree; /** @@ -78,6 +109,18 @@ public class WmsCoilAbnormalVo { @ExcelProperty(value = "判级时间") private Date judgeTime; + /** + * 主标记(1=是,0=否) + */ + @ExcelProperty(value = "主标记") + private Integer mainMark; + + /** + * 整卷标记(1=是,0=否) + */ + @ExcelProperty(value = "整卷标记") + private Integer wholeCoilMark; + /** * 备注 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java index 9ed71f36..768fe09a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java @@ -65,12 +65,19 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition()); - lqw.eq(StringUtils.isNotBlank(bo.getLengthCoord()), WmsCoilAbnormal::getLengthCoord, bo.getLengthCoord()); + lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength()); + lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition()); + lqw.eq(bo.getEndPosition() != null, WmsCoilAbnormal::getEndPosition, bo.getEndPosition()); lqw.eq(StringUtils.isNotBlank(bo.getDefectCode()), WmsCoilAbnormal::getDefectCode, bo.getDefectCode()); + lqw.eq(StringUtils.isNotBlank(bo.getDefectType()), WmsCoilAbnormal::getDefectType, bo.getDefectType()); + lqw.eq(bo.getDefectRate() != null, WmsCoilAbnormal::getDefectRate, bo.getDefectRate()); + lqw.eq(bo.getDefectWeight() != null, WmsCoilAbnormal::getDefectWeight, bo.getDefectWeight()); lqw.eq(StringUtils.isNotBlank(bo.getDegree()), WmsCoilAbnormal::getDegree, bo.getDegree()); lqw.eq(StringUtils.isNotBlank(bo.getJudgeLevel()), WmsCoilAbnormal::getJudgeLevel, bo.getJudgeLevel()); lqw.eq(StringUtils.isNotBlank(bo.getJudgeBy()), WmsCoilAbnormal::getJudgeBy, bo.getJudgeBy()); lqw.eq(bo.getJudgeTime() != null, WmsCoilAbnormal::getJudgeTime, bo.getJudgeTime()); + lqw.eq(bo.getMainMark() != null, WmsCoilAbnormal::getMainMark, bo.getMainMark()); + lqw.eq(bo.getWholeCoilMark() != null, WmsCoilAbnormal::getWholeCoilMark, bo.getWholeCoilMark()); return lqw; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml index cd153668..0803a5e2 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml @@ -8,12 +8,19 @@ - + + + + + + + +