feat(WmsMaterialCoil): 添加生产时间和预留宽度字段支持
- 在 WmsMaterialCoil 实体类中新增生产开始时间、生产结束时间、生产耗时和预留宽度字段 - 在 WmsMaterialCoilBo 业务对象中添加对应的生产时间相关字段和格式化注解 - 在 WmsMaterialCoilVo 视图对象中增加生产时间字段和 Excel 导出支持 - 更新 MyBatis 映射文件中的结果映射和查询字段列表 - 在服务实现类中添加生产时间相关的查询条件过滤逻辑
This commit is contained in:
@@ -170,5 +170,27 @@ public class WmsMaterialCoil extends BaseEntity {
|
||||
* 实测宽度
|
||||
*/
|
||||
private BigDecimal actualWidth;
|
||||
|
||||
/**
|
||||
* 生产开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionStartTime;
|
||||
|
||||
/**
|
||||
* 生产结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionEndTime;
|
||||
|
||||
/**
|
||||
* 生产耗时(单位:分钟)
|
||||
*/
|
||||
private BigDecimal productionDuration;
|
||||
|
||||
/**
|
||||
* 预留宽度(单位:毫米)
|
||||
*/
|
||||
private BigDecimal reservedWidth;
|
||||
}
|
||||
|
||||
|
||||
@@ -285,5 +285,29 @@ public class WmsMaterialCoilBo extends BaseEntity {
|
||||
* 实测宽度
|
||||
*/
|
||||
private BigDecimal actualWidth;
|
||||
|
||||
/**
|
||||
* 生产开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionStartTime;
|
||||
|
||||
/**
|
||||
* 生产结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionEndTime;
|
||||
|
||||
/**
|
||||
* 生产耗时(单位:分钟)
|
||||
*/
|
||||
private BigDecimal productionDuration;
|
||||
|
||||
/**
|
||||
* 预留宽度(单位:毫米)
|
||||
*/
|
||||
private BigDecimal reservedWidth;
|
||||
}
|
||||
|
||||
|
||||
@@ -446,5 +446,27 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
||||
*/
|
||||
@ExcelProperty(value = "实测宽度")
|
||||
private BigDecimal actualWidth;
|
||||
|
||||
/**
|
||||
* 生产开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionStartTime;
|
||||
|
||||
/**
|
||||
* 生产结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionEndTime;
|
||||
|
||||
/**
|
||||
* 生产耗时(单位:分钟)
|
||||
*/
|
||||
private BigDecimal productionDuration;
|
||||
|
||||
/**
|
||||
* 预留宽度(单位:毫米)
|
||||
*/
|
||||
private BigDecimal reservedWidth;
|
||||
}
|
||||
|
||||
|
||||
@@ -479,6 +479,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
qw.eq(bo.getActualLength() != null, "mc.actual_length", bo.getActualLength());
|
||||
// 实测宽度
|
||||
qw.eq(bo.getActualWidth() != null, "mc.actual_width", bo.getActualWidth());
|
||||
// 生产开始时间
|
||||
qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
|
||||
// 生产结束时间
|
||||
qw.eq(bo.getProductionEndTime() != null, "mc.production_end_time", bo.getProductionEndTime());
|
||||
// 生产耗时
|
||||
qw.eq(bo.getProductionDuration() != null, "mc.production_duration", bo.getProductionDuration());
|
||||
// 预留宽度
|
||||
qw.eq(bo.getReservedWidth() != null, "mc.reserved_width", bo.getReservedWidth());
|
||||
// 如果actualWarehouseId不为空,则根据实际库区ID进行查询 如果为-1,则查询无库区的数据
|
||||
if (bo.getActualWarehouseId() != null) {
|
||||
if (bo.getActualWarehouseId() == -1) {
|
||||
|
||||
@@ -24,6 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="length" column="length"/>
|
||||
<result property="actualLength" column="actual_length"/>
|
||||
<result property="actualWidth" column="actual_width"/>
|
||||
<result property="productionStartTime" column="production_start_time"/>
|
||||
<result property="productionEndTime" column="production_end_time"/>
|
||||
<result property="productionDuration" column="production_duration"/>
|
||||
<result property="reservedWidth" column="reserved_width"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
@@ -104,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.length,
|
||||
mc.actual_length,
|
||||
mc.actual_width,
|
||||
mc.production_start_time,
|
||||
mc.production_end_time,
|
||||
mc.production_duration,
|
||||
mc.reserved_width,
|
||||
mc.coating_type,
|
||||
mc.temper_grade,
|
||||
mc.business_purpose,
|
||||
@@ -196,6 +204,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.length,
|
||||
mc.actual_length,
|
||||
mc.actual_width,
|
||||
mc.production_start_time,
|
||||
mc.production_end_time,
|
||||
mc.production_duration,
|
||||
mc.reserved_width,
|
||||
mc.coating_type,
|
||||
mc.temper_grade,
|
||||
mc.business_purpose,
|
||||
|
||||
Reference in New Issue
Block a user