Merge remote-tracking branch 'origin/dev' into dev
| | |
| | | private String department; |
| | | |
| | | /** 计划开工日 */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") |
| | | private Date planStartDay; |
| | | |
| | | /** 计划完工日 */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") |
| | | private Date planEndDay; |
| | | |
| | | /** 备料料号 */ |
| | |
| | | private BigDecimal processTotalTime; |
| | | |
| | | /** 计划开工日 */ |
| | | @Excel(name = "计划开工日") |
| | | @Schema(description = "计划开工日", type = "Date") |
| | | @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
| | | private Date processPlanStartDay; |
| | | |
| | | /** 设计工时 */ |
| | |
| | | private BigDecimal standardTime; |
| | | |
| | | /** 工序计划开始时间 */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @Excel(name = "工序计划开始时间", width = 30, dateFormat = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
| | | @Excel(name = "工序计划开始时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") |
| | | private Date palnStartDate; |
| | | |
| | | /** 工序计划完成日期 */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @Excel(name = "工序计划完成日期", width = 30, dateFormat = "yyyy-MM-dd") |
| | | @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") |
| | | @Excel(name = "工序计划完成日期", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") |
| | | private Date planCompleteDate; |
| | | |
| | | /** 加工数量-小数 */ |