添加web的合卷分卷合并操作
This commit is contained in:
100
klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java
Normal file
100
klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java
Normal file
@@ -0,0 +1,100 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 钢卷待操作对象 wms_coil_pending_action
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-11-03
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_coil_pending_action")
|
||||
public class WmsCoilPendingAction extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "action_id", type = IdType.AUTO)
|
||||
private Long actionId;
|
||||
|
||||
/**
|
||||
* 关联的钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 当前钢卷号
|
||||
*/
|
||||
private String currentCoilNo;
|
||||
|
||||
/**
|
||||
* 操作类型（1=分卷，2=合卷，3=更新）
|
||||
*/
|
||||
private Integer actionType;
|
||||
|
||||
/**
|
||||
* 操作状态（0=待处理，1=处理中，2=已完成，3=已取消）
|
||||
*/
|
||||
private Integer actionStatus;
|
||||
|
||||
/**
|
||||
* 扫码时间
|
||||
*/
|
||||
private Date scanTime;
|
||||
|
||||
/**
|
||||
* 扫码设备（移动端设备信息）
|
||||
*/
|
||||
private String scanDevice;
|
||||
|
||||
/**
|
||||
* 优先级（0=普通，1=重要，2=紧急）
|
||||
*/
|
||||
private Integer priority;
|
||||
|
||||
/**
|
||||
* 来源类型（scan=扫码，manual=手动创建）
|
||||
*/
|
||||
private String sourceType;
|
||||
|
||||
/**
|
||||
* 所在库区ID
|
||||
*/
|
||||
private Long warehouseId;
|
||||
|
||||
/**
|
||||
* 操作人ID
|
||||
*/
|
||||
private Long operatorId;
|
||||
|
||||
/**
|
||||
* 操作人姓名
|
||||
*/
|
||||
private String operatorName;
|
||||
|
||||
/**
|
||||
* 处理时间
|
||||
*/
|
||||
private Date processTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
private Date completeTime;
|
||||
|
||||
/**
|
||||
* 删除标志（0=正常，1=已删除）
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
import java.util.Date;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 钢卷待操作业务对象 wms_coil_pending_action
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-11-03
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsCoilPendingActionBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
|
||||
private Long actionId;
|
||||
|
||||
/**
|
||||
* 关联的钢卷ID
|
||||
*/
|
||||
@NotNull(message = "关联的钢卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 当前钢卷号
|
||||
*/
|
||||
@NotBlank(message = "当前钢卷号不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String currentCoilNo;
|
||||
|
||||
/**
|
||||
* 操作类型（1=分卷，2=合卷，3=更新）
|
||||
*/
|
||||
@NotNull(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Integer actionType;
|
||||
|
||||
/**
|
||||
* 操作状态（0=待处理，1=处理中，2=已完成，3=已取消）
|
||||
*/
|
||||
private Integer actionStatus;
|
||||
|
||||
/**
|
||||
* 扫码时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
|
||||
private Date scanTime;
|
||||
|
||||
/**
|
||||
* 扫码设备（移动端设备信息）
|
||||
*/
|
||||
private String scanDevice;
|
||||
|
||||
/**
|
||||
* 优先级（0=普通，1=重要，2=紧急）
|
||||
*/
|
||||
private Integer priority;
|
||||
|
||||
/**
|
||||
* 来源类型（scan=扫码，manual=手动创建）
|
||||
*/
|
||||
private String sourceType;
|
||||
|
||||
/**
|
||||
* 所在库区ID
|
||||
*/
|
||||
private Long warehouseId;
|
||||
|
||||
/**
|
||||
* 操作人ID
|
||||
*/
|
||||
private Long operatorId;
|
||||
|
||||
/**
|
||||
* 操作人姓名
|
||||
*/
|
||||
private String operatorName;
|
||||
|
||||
/**
|
||||
* 处理时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
|
||||
private Date processTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
|
||||
private Date completeTime;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
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 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 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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user