Browse Source
生产管理 生产退料 修改生产退料列表页面，新增表格行样式，修改搜索栏输入，新增导出方法； 修改生产退料详情页面，修改已退料数字段名称； 新增获取生产退料单导出列表service方法； 修改生产退料mapper，修改列表查询，时间区间查询，添加排序，新增根据退料单号批量查询退料单方法； 新增根据退料单号和料号查询退料单详情mapper方法；dev
10 changed files with 238 additions and 15 deletions
@ -0,0 +1,108 @@ |
|||
package com.ruoyi.system.domain.exportDto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.ruoyi.common.annotation.Excel; |
|||
import com.ruoyi.common.core.domain.BaseEntity; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/* |
|||
* 生产退料单导出对象*/ |
|||
@Data |
|||
public class MakeReturnOrderDto extends BaseEntity { |
|||
|
|||
/** 生产退料单号 */ |
|||
@Excel(name = "生产退料单号") |
|||
private String makeReturnOrderCode; |
|||
|
|||
/** 生产领料单号 */ |
|||
@Excel(name = "生产领料单号") |
|||
private String pickNo; |
|||
|
|||
/** 退料状态（0待退料，1部分退料，2全部退料） */ |
|||
@Excel(name = "退料状态", dictType = "return_status") |
|||
private String returnStatus; |
|||
|
|||
/** 物料合计 */ |
|||
@Excel(name = "物料合计") |
|||
private Integer materialSum; |
|||
|
|||
/** 退料数量合计 */ |
|||
@Excel(name = "退料数合计") |
|||
private Integer returnSum; |
|||
|
|||
/** 合格数 */ |
|||
@Excel(name = "合格数") |
|||
private Integer qualifiedNum; |
|||
|
|||
/** 不良数 */ |
|||
@Excel(name = "不良数") |
|||
private Integer unqualifiedNum; |
|||
|
|||
/** 入库数 */ |
|||
@Excel(name = "入库数") |
|||
private Integer storageNum; |
|||
|
|||
/** 申请人 */ |
|||
@Excel(name = "申请人") |
|||
private String applyUser; |
|||
|
|||
/** 申请时间 */ |
|||
@JsonFormat(pattern = "yyyy-MM-dd") |
|||
@Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") |
|||
private Date applyTime; |
|||
|
|||
/** 审核状态（0待审核，1审核通过，2审核拒绝） */ |
|||
@Excel(name = "审核状态", dictType = "auditStatus") |
|||
private String auditStatus; |
|||
|
|||
/** 料号 */ |
|||
@Excel(name = "料号") |
|||
private String materialNo; |
|||
|
|||
/** 物料名称 */ |
|||
@Excel(name = "物料名称") |
|||
private String materialName; |
|||
|
|||
/** 图片 */ |
|||
@Excel(name = "图片") |
|||
private String photoUrl; |
|||
|
|||
/** 物料型号 */ |
|||
@Excel(name = "物料型号") |
|||
private String materialModel; |
|||
|
|||
/** 加工方式 */ |
|||
@Excel(name = "加工方式",dictType = "processMethod") |
|||
private String processMethod; |
|||
|
|||
/** 品牌 */ |
|||
@Excel(name = "品牌 ") |
|||
private String brand; |
|||
|
|||
/** 单位 */ |
|||
@Excel(name = "单位") |
|||
private String unit; |
|||
|
|||
/** 描述 */ |
|||
@Excel(name = "描述") |
|||
private String describe; |
|||
|
|||
/** 用量 */ |
|||
@Excel(name = "用量") |
|||
private Integer useNum; |
|||
|
|||
/** 已领料数 */ |
|||
@Excel(name = "已领料数") |
|||
private Integer hasPickNum; |
|||
|
|||
/** 已退料数 */ |
|||
@Excel(name = "实际已退料数") |
|||
private Integer hasReturnNum; |
|||
|
|||
/** 本次退料数 */ |
|||
@Excel(name = "本次退料数") |
|||
private Integer returnNum; |
|||
|
|||
} |
|||
Loading…
Reference in new issue