- 在 ISysUserService 中新增 selectNickNameMapByUserNames 方法 - 实现批量查询用户昵称的功能,提高查询效率 - 移除原有的单个用户查询方法 selectUserByUserName - 优化 WmsCoilPendingActionServiceImpl 中的用户昵称设置逻辑 - 优化 WmsDeliveryPlanServiceImpl 中的用户昵称设置逻辑 - 优化 WmsMaterialCoilServiceImpl 中的用户昵称设置逻辑 - 删除重复的 getUserNickname 私有方法 - 在 WmsCoilPendingActionVo 中新增 operatorByName 字段 - 统一使用新的批量接口替代原有单条查询方式 - 添加必要的 import 和工具类引用
168 lines
3.3 KiB
Java
168 lines
3.3 KiB
Java
package com.klp.domain.vo;
|
||
|
||
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 com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
|
||
import java.io.Serializable;
|
||
import java.util.Date;
|
||
|
||
/**
|
||
* 钢卷待操作视图对象 wms_coil_pending_action
|
||
*
|
||
* @author Joshi
|
||
* @date 2025-11-03
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsCoilPendingActionVo extends BaseEntity implements Serializable {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
/**
|
||
* 主键ID
|
||
*/
|
||
@ExcelProperty(value = "主键ID")
|
||
private Long actionId;
|
||
|
||
/**
|
||
* 关联的钢卷ID
|
||
*/
|
||
@ExcelProperty(value = "钢卷ID")
|
||
private Long coilId;
|
||
|
||
/**
|
||
* 当前钢卷号
|
||
*/
|
||
@ExcelProperty(value = "钢卷号")
|
||
private String currentCoilNo;
|
||
|
||
/**
|
||
* 操作类型(1=分卷,2=合卷,3=更新)
|
||
*/
|
||
@ExcelProperty(value = "操作类型", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(dictType = "wms_coil_action_type")
|
||
private Integer actionType;
|
||
|
||
/**
|
||
* 操作状态(0=待处理,1=处理中,2=已完成,3=已取消)
|
||
*/
|
||
@ExcelProperty(value = "操作状态", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(dictType = "wms_action_status")
|
||
private Integer actionStatus;
|
||
|
||
/**
|
||
* 扫码时间
|
||
*/
|
||
@ExcelProperty(value = "扫码时间")
|
||
private Date scanTime;
|
||
|
||
/**
|
||
* 扫码设备
|
||
*/
|
||
@ExcelProperty(value = "扫码设备")
|
||
private String scanDevice;
|
||
|
||
/**
|
||
* 优先级(0=普通,1=重要,2=紧急)
|
||
*/
|
||
@ExcelProperty(value = "优先级", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(dictType = "wms_action_priority")
|
||
private Integer priority;
|
||
|
||
/**
|
||
* 来源类型
|
||
*/
|
||
@ExcelProperty(value = "来源类型")
|
||
private String sourceType;
|
||
|
||
/**
|
||
* 所在库区ID
|
||
*/
|
||
private Long warehouseId;
|
||
|
||
/**
|
||
* 库区名称
|
||
*/
|
||
@ExcelProperty(value = "库区")
|
||
private String warehouseName;
|
||
|
||
/**
|
||
* 操作人ID
|
||
*/
|
||
private Long operatorId;
|
||
|
||
/**
|
||
* 操作人姓名
|
||
*/
|
||
@ExcelProperty(value = "操作人")
|
||
private String operatorName;
|
||
|
||
/**
|
||
* 处理时间
|
||
*/
|
||
@ExcelProperty(value = "处理时间")
|
||
private Date processTime;
|
||
|
||
/**
|
||
* 完成时间
|
||
*/
|
||
@ExcelProperty(value = "完成时间")
|
||
private Date completeTime;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
@ExcelProperty(value = "备注")
|
||
private String remark;
|
||
|
||
/**
|
||
* 创建时间
|
||
*/
|
||
@ExcelProperty(value = "创建时间")
|
||
private Date createTime;
|
||
|
||
// 钢卷相关信息(关联查询)
|
||
/**
|
||
* 钢种
|
||
*/
|
||
private String grade;
|
||
|
||
/**
|
||
* 厚度
|
||
*/
|
||
private Double thickness;
|
||
|
||
/**
|
||
* 宽度
|
||
*/
|
||
private Double width;
|
||
|
||
/**
|
||
* 重量
|
||
*/
|
||
private Double weight;
|
||
|
||
private String enterCoilNo;
|
||
private String supplierCoilNo;
|
||
private Long itemId;
|
||
private String itemType;
|
||
|
||
/**
|
||
* 创建人昵称
|
||
*/
|
||
private String createByName;
|
||
|
||
/**
|
||
* 更新人昵称
|
||
*/
|
||
private String updateByName;
|
||
|
||
private String operatorByName;
|
||
|
||
}
|
||
|