Jcdm041-Mes.git

Merge remote-tracking branch 'origin/master'

hdy

2024-01-31 11cf273c59ae476e8be9ce80fc93c6c2722f7bce

提交 \| 用户 \| 时间
d9cf6b	1	package com.jcdm.main.bs.orderScheduling.domain;
J	2
c74dcb	3	import com.alibaba.excel.annotation.ExcelIgnore;
W	4	import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
	5	import com.alibaba.excel.annotation.ExcelProperty;
	6	import com.alibaba.excel.annotation.write.style.ColumnWidth;
	7	import com.alibaba.excel.annotation.write.style.HeadFontStyle;
	8	import com.alibaba.excel.annotation.write.style.HeadRowHeight;
9ebb88	9	import com.baomidou.mybatisplus.annotation.TableField;
W	10	import com.fasterxml.jackson.annotation.JsonFormat;
	11	import lombok.Data;
d9cf6b	12	import org.apache.commons.lang3.builder.ToStringBuilder;
J	13	import org.apache.commons.lang3.builder.ToStringStyle;
	14	import com.jcdm.common.annotation.Excel;
	15	import com.jcdm.common.core.domain.BaseEntity;
9ebb88	16	import org.springframework.format.annotation.DateTimeFormat;
d9cf6b	17
9ebb88	18	import java.time.LocalDateTime;
797845	19	import java.util.Date;
9ebb88	20	import java.util.List;
797845	21
d9cf6b	22	/**
J	23	* 订单排产对象 bs_order_scheduling
	24	*
	25	* @author jiang
2aea64	26	* @date 2024-01-13
d9cf6b	27	*/
9ebb88	28	@Data
c74dcb	29	@ExcelIgnoreUnannotated
W	30	@ColumnWidth(16)
	31	@HeadRowHeight(14)
	32	@HeadFontStyle(fontHeightInPoints = 11)
d9cf6b	33	public class BsOrderScheduling extends BaseEntity
J	34	{
	35	private static final long serialVersionUID = 1L;
	36
2aea64	37	/** ID */
J	38	private Long id;
	39
d9cf6b	40	/** 订单编号 */
J	41	@Excel(name = "订单编号")
c74dcb	42	@ExcelProperty(value = "订单编号", index = 0)
2aea64	43	private String orderNo;
d9cf6b	44
J	45	/** 发动机号 */
c74dcb	46	@Excel(name = "箱体编码")
W	47	@ExcelProperty(value = "箱体编码", index = 1)
d9cf6b	48	private String engineNo;
c74dcb	49
W	50	@TableField(exist = false)
	51	@ExcelIgnore
	52	private List<String> engineNoList;
	53
	54	@TableField(exist = false)
	55	@ExcelIgnore
	56	private List<String> engineNoListExcel;
	57
d9cf6b	58
J	59	/** 产品类型 */
	60	@Excel(name = "产品类型")
	61	private String productType;
	62
c74dcb	63	@ExcelProperty(value = "产品类型", index = 2)
W	64	private String productTypeString;
	65
d9cf6b	66	/** 机型 */
J	67	@Excel(name = "机型")
c74dcb	68	@ExcelProperty(value = "机型", index = 3)
d9cf6b	69	private String model;
J	70
	71	/** 生产状态 */
	72	@Excel(name = "生产状态")
	73	private String productionStatus;
	74
c74dcb	75	@ExcelProperty(value = "生产状态", index = 4)
W	76	private String productionStatusString;
	77
d9cf6b	78	/** 工时 */
J	79	@Excel(name = "工时")
c74dcb	80	@ExcelProperty(value = "工时", index = 5)
d9cf6b	81	private String workingHours;
J	82
	83	/** 当前工位 */
	84	@Excel(name = "当前工位")
c74dcb	85	@ExcelProperty(value = "当前工位", index = 6)
d9cf6b	86	private String currentWorkstation;
J	87
	88	/** 质量状态 */
	89	@Excel(name = "质量状态")
c74dcb	90	@ExcelProperty(value = "质量状态", index = 7)
d9cf6b	91	private String qualityStatus;
J	92
	93	/** 是否打印 */
	94	@Excel(name = "是否打印")
	95	private String whetherOrPrint;
	96
	97	/** 10报工 */
	98	@Excel(name = "10报工")
c74dcb	99	@ExcelIgnore
d9cf6b	100	private String report10;
J	101
	102	/** 20报工 */
	103	@Excel(name = "20报工")
c74dcb	104	@ExcelIgnore
d9cf6b	105	private String report20;
J	106
	107	/** 合箱上线 */
	108	@Excel(name = "合箱上线")
c74dcb	109	@ExcelIgnore
2aea64	110	private String combinedBoxTime;
d9cf6b	111
J	112	/** 总装下线 */
	113	@Excel(name = "总装下线")
c74dcb	114	@ExcelIgnore
2aea64	115	private String finalAssemblyTime;
d9cf6b	116
J	117	/** 操作人 */
	118	@Excel(name = "操作人")
c74dcb	119	@ExcelProperty(value = "操作人", index = 14)
d9cf6b	120	private String operator;
J	121
	122	/** 操作时间 */
	123	@Excel(name = "操作时间")
c74dcb	124	@ExcelProperty(value = "操作时间", index = 15)
d9cf6b	125	private String operateTime;
J	126
2aea64	127	/** 状态 */
J	128	@Excel(name = "状态")
c74dcb	129	@ExcelIgnore
2aea64	130	private String status;
J	131
	132	/** 预留字段1 */
	133	@Excel(name = "预留字段1")
c74dcb	134	@ExcelIgnore
2aea64	135	private String spareField1;
J	136
	137	/** 预留字段2 */
	138	@Excel(name = "预留字段2")
c74dcb	139	@ExcelIgnore
2aea64	140	private String spareField2;
J	141
	142	/** 预留字段3 */
	143	@Excel(name = "预留字段3")
c74dcb	144	@ExcelIgnore
2aea64	145	private String spareField3;
J	146
	147	/** 预留字段4 */
	148	@Excel(name = "预留字段4")
c74dcb	149	@ExcelIgnore
2aea64	150	private String spareField4;
J	151
	152	/** 创建用户 */
	153	@Excel(name = "创建用户")
c74dcb	154	@ExcelIgnore
2aea64	155	private String createUser;
J	156
	157	/** 更改用户 */
	158	@Excel(name = "更改用户")
c74dcb	159	@ExcelIgnore
2aea64	160	private String updateUser;
J	161
	162	/** 备注 */
	163	@Excel(name = "备注")
c74dcb	164	@ExcelIgnore
2aea64	165	private String remarks;
J	166
1391b3	167	/** CVT报工 */
懒	168	@Excel(name = "CVT报工")
c74dcb	169	@ExcelIgnore
1391b3	170	private String report30;
懒	171
c74dcb	172	@ExcelIgnore
d2b752	173	private String[] dateConditions;
懒	174
c74dcb	175	@ExcelIgnore
d2b752	176	private String startTime;
懒	177
c74dcb	178	@ExcelIgnore
d2b752	179	private String endTime;
懒	180
797845	181	/** 合箱上线时间 */
懒	182	@Excel(name = "合箱上线时间")
c74dcb	183	@ExcelProperty(value = "合箱上线时间", index = 8)
W	184	@com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd HH:mm:ss")
	185	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	186	private Date boxClosingOnlineTime;
懒	187
	188	/** 合箱下线时间 */
	189	@Excel(name = "合箱下线时间")
c74dcb	190	@ExcelProperty(value = "合箱下线时间", index = 9)
W	191	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	192	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	193	private Date closingBoxOfflineTime;
懒	194
	195	/** 总装上线时间 */
	196	@Excel(name = "总装上线时间")
c74dcb	197	@ExcelProperty(value = "总装上线时间", index =10)
W	198	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	199	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	200	private Date finalAssemblyLaunchTime;
懒	201
	202	/** 总装下线时间 */
	203	@Excel(name = "总装下线时间")
c74dcb	204	@ExcelProperty(value = "总装下线时间", index = 11)
W	205	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	206	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	207	private Date finalAssemblyOfflineTime;
懒	208
	209	/** CVT上线时间 */
	210	@Excel(name = "CVT上线时间")
c74dcb	211	@ExcelProperty(value = "CVT上线时间", index = 12)
W	212	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	213	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	214	private Date cvtLaunchTime;
懒	215
	216	/** CVT下线时间 */
	217	@Excel(name = "CVT下线时间")
c74dcb	218	@ExcelProperty(value = "CVT下线时间", index = 13)
W	219	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	220	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
797845	221	private Date cvtOfflineTime;
懒	222
9ebb88	223	@TableField(exist = false)
W	224	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	225	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
c74dcb	226	@ExcelIgnore
9ebb88	227	private LocalDateTime startQuery;
W	228
	229	@TableField(exist = false)
	230	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	231	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
c74dcb	232	@ExcelIgnore
9ebb88	233	private LocalDateTime endQuery;
W	234
	235	@TableField(exist = false)
c74dcb	236	@ExcelIgnore
9ebb88	237	private String queryField;
W	238
797845	239	public Date getBoxClosingOnlineTime() {
懒	240	return boxClosingOnlineTime;
	241	}
	242
	243	public void setBoxClosingOnlineTime(Date boxClosingOnlineTime) {
	244	this.boxClosingOnlineTime = boxClosingOnlineTime;
	245	}
	246
	247	public Date getClosingBoxOfflineTime() {
	248	return closingBoxOfflineTime;
	249	}
	250
	251	public void setClosingBoxOfflineTime(Date closingBoxOfflineTime) {
	252	this.closingBoxOfflineTime = closingBoxOfflineTime;
	253	}
	254
	255	public Date getFinalAssemblyLaunchTime() {
	256	return finalAssemblyLaunchTime;
	257	}
	258
	259	public void setFinalAssemblyLaunchTime(Date finalAssemblyLaunchTime) {
	260	this.finalAssemblyLaunchTime = finalAssemblyLaunchTime;
	261	}
	262
	263	public Date getFinalAssemblyOfflineTime() {
	264	return finalAssemblyOfflineTime;
	265	}
	266
	267	public void setFinalAssemblyOfflineTime(Date finalAssemblyOfflineTime) {
	268	this.finalAssemblyOfflineTime = finalAssemblyOfflineTime;
	269	}
	270
	271	public Date getCvtLaunchTime() {
	272	return cvtLaunchTime;
	273	}
	274
	275	public void setCvtLaunchTime(Date cvtLaunchTime) {
	276	this.cvtLaunchTime = cvtLaunchTime;
	277	}
	278
	279	public Date getCvtOfflineTime() {
	280	return cvtOfflineTime;
	281	}
	282
	283	public void setCvtOfflineTime(Date cvtOfflineTime) {
	284	this.cvtOfflineTime = cvtOfflineTime;
	285	}
	286
d2b752	287	public String[] getDateConditions() {
懒	288	return dateConditions;
	289	}
	290
	291	public void setDateConditions(String[] dateConditions) {
	292	this.dateConditions = dateConditions;
	293	}
	294
	295	public String getStartTime() {
	296	return startTime;
	297	}
	298
	299	public void setStartTime(String startTime) {
	300	this.startTime = startTime;
	301	}
	302
	303	public String getEndTime() {
	304	return endTime;
	305	}
	306
	307	public void setEndTime(String endTime) {
	308	this.endTime = endTime;
	309	}
	310
1391b3	311	public String getReport30() {
懒	312	return report30;
	313	}
	314
	315	public void setReport30(String report30) {
	316	this.report30 = report30;
	317	}
	318
	319	public void setId(Long id)
d9cf6b	320	{
2aea64	321	this.id = id;
d9cf6b	322	}
J	323
2aea64	324	public Long getId()
d9cf6b	325	{
2aea64	326	return id;
J	327	}
	328	public void setOrderNo(String orderNo)
	329	{
	330	this.orderNo = orderNo;
	331	}
	332
	333	public String getOrderNo()
	334	{
	335	return orderNo;
d9cf6b	336	}
J	337	public void setEngineNo(String engineNo)
	338	{
	339	this.engineNo = engineNo;
	340	}
	341
	342	public String getEngineNo()
	343	{
	344	return engineNo;
	345	}
	346	public void setProductType(String productType)
	347	{
	348	this.productType = productType;
	349	}
	350
	351	public String getProductType()
	352	{
	353	return productType;
	354	}
	355	public void setModel(String model)
	356	{
	357	this.model = model;
	358	}
	359
	360	public String getModel()
	361	{
	362	return model;
	363	}
	364	public void setProductionStatus(String productionStatus)
	365	{
	366	this.productionStatus = productionStatus;
	367	}
	368
	369	public String getProductionStatus()
	370	{
	371	return productionStatus;
	372	}
	373	public void setWorkingHours(String workingHours)
	374	{
	375	this.workingHours = workingHours;
	376	}
	377
	378	public String getWorkingHours()
	379	{
	380	return workingHours;
	381	}
	382	public void setCurrentWorkstation(String currentWorkstation)
	383	{
	384	this.currentWorkstation = currentWorkstation;
	385	}
	386
	387	public String getCurrentWorkstation()
	388	{
	389	return currentWorkstation;
	390	}
	391	public void setQualityStatus(String qualityStatus)
	392	{
	393	this.qualityStatus = qualityStatus;
	394	}
	395
	396	public String getQualityStatus()
	397	{
	398	return qualityStatus;
	399	}
	400	public void setWhetherOrPrint(String whetherOrPrint)
	401	{
	402	this.whetherOrPrint = whetherOrPrint;
	403	}
	404
	405	public String getWhetherOrPrint()
	406	{
	407	return whetherOrPrint;
	408	}
	409	public void setReport10(String report10)
	410	{
	411	this.report10 = report10;
	412	}
	413
	414	public String getReport10()
	415	{
	416	return report10;
	417	}
	418	public void setReport20(String report20)
	419	{
	420	this.report20 = report20;
	421	}
	422
	423	public String getReport20()
	424	{
	425	return report20;
	426	}
2aea64	427	public void setCombinedBoxTime(String combinedBoxTime)
d9cf6b	428	{
2aea64	429	this.combinedBoxTime = combinedBoxTime;
d9cf6b	430	}
J	431
2aea64	432	public String getCombinedBoxTime()
d9cf6b	433	{
2aea64	434	return combinedBoxTime;
d9cf6b	435	}
2aea64	436	public void setFinalAssemblyTime(String finalAssemblyTime)
d9cf6b	437	{
2aea64	438	this.finalAssemblyTime = finalAssemblyTime;
d9cf6b	439	}
J	440
2aea64	441	public String getFinalAssemblyTime()
d9cf6b	442	{
2aea64	443	return finalAssemblyTime;
d9cf6b	444	}
J	445	public void setOperator(String operator)
	446	{
	447	this.operator = operator;
	448	}
	449
	450	public String getOperator()
	451	{
	452	return operator;
	453	}
	454	public void setOperateTime(String operateTime)
	455	{
	456	this.operateTime = operateTime;
	457	}
	458
	459	public String getOperateTime()
	460	{
	461	return operateTime;
	462	}
2aea64	463	public void setStatus(String status)
J	464	{
	465	this.status = status;
	466	}
	467
	468	public String getStatus()
	469	{
	470	return status;
	471	}
	472	public void setSpareField1(String spareField1)
	473	{
	474	this.spareField1 = spareField1;
	475	}
	476
	477	public String getSpareField1()
	478	{
	479	return spareField1;
	480	}
	481	public void setSpareField2(String spareField2)
	482	{
	483	this.spareField2 = spareField2;
	484	}
	485
	486	public String getSpareField2()
	487	{
	488	return spareField2;
	489	}
	490	public void setSpareField3(String spareField3)
	491	{
	492	this.spareField3 = spareField3;
	493	}
	494
	495	public String getSpareField3()
	496	{
	497	return spareField3;
	498	}
	499	public void setSpareField4(String spareField4)
	500	{
	501	this.spareField4 = spareField4;
	502	}
	503
	504	public String getSpareField4()
	505	{
	506	return spareField4;
	507	}
	508	public void setCreateUser(String createUser)
	509	{
	510	this.createUser = createUser;
	511	}
	512
	513	public String getCreateUser()
	514	{
	515	return createUser;
	516	}
	517	public void setUpdateUser(String updateUser)
	518	{
	519	this.updateUser = updateUser;
	520	}
	521
	522	public String getUpdateUser()
	523	{
	524	return updateUser;
	525	}
	526	public void setRemarks(String remarks)
	527	{
	528	this.remarks = remarks;
	529	}
	530
	531	public String getRemarks()
	532	{
	533	return remarks;
	534	}
d9cf6b	535
J	536	@Override
	537	public String toString() {
	538	return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
2aea64	539	.append("id", getId())
J	540	.append("orderNo", getOrderNo())
d9cf6b	541	.append("engineNo", getEngineNo())
J	542	.append("productType", getProductType())
	543	.append("model", getModel())
	544	.append("productionStatus", getProductionStatus())
	545	.append("workingHours", getWorkingHours())
	546	.append("currentWorkstation", getCurrentWorkstation())
	547	.append("qualityStatus", getQualityStatus())
	548	.append("whetherOrPrint", getWhetherOrPrint())
	549	.append("report10", getReport10())
	550	.append("report20", getReport20())
2aea64	551	.append("combinedBoxTime", getCombinedBoxTime())
J	552	.append("finalAssemblyTime", getFinalAssemblyTime())
d9cf6b	553	.append("operator", getOperator())
J	554	.append("operateTime", getOperateTime())
2aea64	555	.append("status", getStatus())
J	556	.append("spareField1", getSpareField1())
	557	.append("spareField2", getSpareField2())
	558	.append("spareField3", getSpareField3())
	559	.append("spareField4", getSpareField4())
	560	.append("createUser", getCreateUser())
	561	.append("createTime", getCreateTime())
	562	.append("updateUser", getUpdateUser())
	563	.append("updateTime", getUpdateTime())
	564	.append("remarks", getRemarks())
d9cf6b	565	.toString();
J	566	}
	567	}