JR
21f15b8744
- 在 WmsBatch、WmsBatchBo、WmsBatchVo 类中添加 planId 字段 - 在 WmsBatchMapper.xml 中添加 planId 的 resultMap 配置 - 在 WmsBatchServiceImpl 中添加 planId 的查询条件
89 lines
2.3 KiB
Java
89 lines
2.3 KiB
Java
package com.klp.domain.vo;
|
||
|
||
import java.util.Date;
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||
import com.alibaba.excel.annotation.ExcelProperty;
|
||
import com.klp.common.annotation.ExcelDictFormat;
|
||
import com.klp.common.convert.ExcelDictConvert;
|
||
import lombok.Data;
|
||
|
||
|
||
/**
|
||
* 批次（合并相同工艺的任务）视图对象 wms_batch
|
||
*
|
||
* @author klp
|
||
* @date 2025-08-14
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsBatchVo {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
/**
|
||
* 批次ID
|
||
*/
|
||
@ExcelProperty(value = "批次ID")
|
||
private Long batchId;
|
||
|
||
/**
|
||
* 批次编号
|
||
*/
|
||
@ExcelProperty(value = "批次编号")
|
||
private String batchNo;
|
||
|
||
/**
|
||
* 关联工艺ID（合并的工艺）
|
||
*/
|
||
@ExcelProperty(value = "关联工艺ID", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "合=并的工艺")
|
||
private Long processId;
|
||
|
||
/**
|
||
* 批次总数量（合并的任务总量）
|
||
*/
|
||
@ExcelProperty(value = "批次总数量", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "合=并的任务总量")
|
||
private Long totalQuantity;
|
||
|
||
/**
|
||
* 合并来源（记录被合并的工艺任务ID，用逗号分隔）
|
||
*/
|
||
@ExcelProperty(value = "合并来源", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "记=录被合并的工艺任务ID，用逗号分隔")
|
||
private String mergeSource;
|
||
|
||
/**
|
||
* 预计开始时间
|
||
*/
|
||
@ExcelProperty(value = "预计开始时间")
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||
private Date estimatedStartTime;
|
||
|
||
/**
|
||
* 预计结束时间
|
||
*/
|
||
@ExcelProperty(value = "预计结束时间")
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||
private Date estimatedEndTime;
|
||
|
||
/**
|
||
* 批次状态：created-已创建/scheduled-已排产/executing-执行中/finished-已完成
|
||
*/
|
||
@ExcelProperty(value = "批次状态：created-已创建/scheduled-已排产/executing-执行中/finished-已完成")
|
||
private String batchStatus;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
@ExcelProperty(value = "备注")
|
||
private String remark;
|
||
|
||
/**
|
||
* 排产计划ID
|
||
*/
|
||
private Long planId;
|
||
|
||
}
|