Jcdm041-Mes.git

Merge remote-tracking branch 'origin/master'

yyt

2024-01-24 87ebb286373e365b4bb427177b26cf00dda1e2f3

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