feat(wms): 添加钢卷异常记录中的产线名称字段
- 在 WmsCoilAbnormal 实体类中新增 productionLine 字段 - 在 WmsCoilAbnormalBo 中添加 productionLine 查询条件字段 - 更新数据库映射文件 WmsCoilAbnormalMapper.xml 映射关系 - 在服务层实现类中添加产线名称查询过滤逻辑 - 在 WmsCoilAbnormalVo 视图对象中添加产线名称导出支持
This commit is contained in:
@@ -31,6 +31,12 @@ public class WmsCoilAbnormal extends BaseEntity {
|
|||||||
* 钢卷ID
|
* 钢卷ID
|
||||||
*/
|
*/
|
||||||
private Long coilId;
|
private Long coilId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 产线名称
|
||||||
|
*/
|
||||||
|
private String productionLine;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 位置(上下,操作侧,中间,驱动侧)
|
* 位置(上下,操作侧,中间,驱动侧)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ public class WmsCoilAbnormalBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private Long coilId;
|
private Long coilId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 产线名称
|
||||||
|
*/
|
||||||
|
private String productionLine;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 位置(上下,操作侧,中间,驱动侧)
|
* 位置(上下,操作侧,中间,驱动侧)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ public class WmsCoilAbnormalVo {
|
|||||||
@ExcelProperty(value = "钢卷ID")
|
@ExcelProperty(value = "钢卷ID")
|
||||||
private Long coilId;
|
private Long coilId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 产线名称
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "产线名称")
|
||||||
|
private String productionLine;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 位置(上下,操作侧,中间,驱动侧)
|
* 位置(上下,操作侧,中间,驱动侧)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService {
|
|||||||
Map<String, Object> params = bo.getParams();
|
Map<String, Object> params = bo.getParams();
|
||||||
LambdaQueryWrapper<WmsCoilAbnormal> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<WmsCoilAbnormal> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId());
|
lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsCoilAbnormal::getProductionLine, bo.getProductionLine());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition());
|
lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition());
|
||||||
lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength());
|
lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength());
|
||||||
lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition());
|
lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition());
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<resultMap type="com.klp.domain.WmsCoilAbnormal" id="WmsCoilAbnormalResult">
|
<resultMap type="com.klp.domain.WmsCoilAbnormal" id="WmsCoilAbnormalResult">
|
||||||
<result property="abnormalId" column="abnormal_id"/>
|
<result property="abnormalId" column="abnormal_id"/>
|
||||||
<result property="coilId" column="coil_id"/>
|
<result property="coilId" column="coil_id"/>
|
||||||
|
<result property="productionLine" column="production_line"/>
|
||||||
<result property="position" column="position"/>
|
<result property="position" column="position"/>
|
||||||
<result property="length" column="length"/>
|
<result property="length" column="length"/>
|
||||||
<result property="startPosition" column="start_position"/>
|
<result property="startPosition" column="start_position"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user