feat(hwmom-mes): 新增生产计划明细统计业务对象和视图对象新增 `ProdProductPlanDetailStatisticsBo`用于接收生产计划明细统计的查询条件,包含车间、时间范围、工序、机台、班次、班组及物料等相关字段。
新增 `ProdProductPlanDetailStatisticsVo` 用于展示生产计划明细统计结果, 支持 Excel 导出,包含机台信息、班次数量统计(早班、夜班)、合计数量及动态班次数据。master
parent
37f03aab58
commit
c0830a46d6
@ -0,0 +1,122 @@
|
||||
package org.dromara.mes.domain.bo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
|
||||
import jakarta.validation.constraints.*;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 生产信息统计业务对象 prod_product_plan_detail_statistics
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-05
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ProdProductPlanDetailStatisticsBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 车间ID
|
||||
*/
|
||||
private Long workshopId;
|
||||
|
||||
/**
|
||||
* 开始日期
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date startDate;
|
||||
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date endDate;
|
||||
|
||||
/**
|
||||
* 生产开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionStartTime;
|
||||
|
||||
/**
|
||||
* 生产结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date productionEndTime;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
private Long processId;
|
||||
|
||||
/**
|
||||
* 工序名称
|
||||
*/
|
||||
private String processName;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 机台编号
|
||||
*/
|
||||
private String machineCode;
|
||||
|
||||
/**
|
||||
* 机台名称
|
||||
*/
|
||||
private String machineName;
|
||||
|
||||
/**
|
||||
* 班次ID
|
||||
*/
|
||||
private Long shiftId;
|
||||
|
||||
/**
|
||||
* 班次名称
|
||||
*/
|
||||
private String shiftName;
|
||||
|
||||
/**
|
||||
* 班组ID
|
||||
*/
|
||||
private Long classTeamId;
|
||||
|
||||
/**
|
||||
* 班组名称
|
||||
*/
|
||||
private String teamName;
|
||||
|
||||
/**
|
||||
* 物料类型ID
|
||||
*/
|
||||
private Long materialTypeId;
|
||||
|
||||
/**
|
||||
* 物料类型名称
|
||||
*/
|
||||
private String materialTypeName;
|
||||
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
private String materialName;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
private String materialCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 生产信息统计视图对象 prod_product_plan_detail_statistics
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-05
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class ProdProductPlanDetailStatisticsVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 序号
|
||||
*/
|
||||
@ExcelProperty(value = "序号")
|
||||
private Integer rowNumber;
|
||||
|
||||
/**
|
||||
* 机台编号
|
||||
*/
|
||||
@ExcelProperty(value = "机台")
|
||||
private String machineCode;
|
||||
|
||||
/**
|
||||
* 机台名称
|
||||
*/
|
||||
private String machineName;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 早班数量
|
||||
*/
|
||||
@ExcelProperty(value = "早")
|
||||
private BigDecimal morningShiftAmount;
|
||||
|
||||
/**
|
||||
* 夜班数量
|
||||
*/
|
||||
@ExcelProperty(value = "夜")
|
||||
private BigDecimal nightShiftAmount;
|
||||
|
||||
/**
|
||||
* 合计数量
|
||||
*/
|
||||
@ExcelProperty(value = "合计")
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
@ExcelProperty(value = "单位")
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 动态班次数据 - 用于存储所有班次的统计数据
|
||||
* key: 班次名称, value: 完成数量
|
||||
*/
|
||||
private Map<String, BigDecimal> shiftAmountMap;
|
||||
|
||||
/**
|
||||
* 动态班次名称列表 - 用于动态表头生成
|
||||
*/
|
||||
private java.util.List<String> shiftNames;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue