From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 196 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 195 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index b03aeaf..6756f87 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -1,9 +1,23 @@
package com.jcdm.main.bs.orderScheduling.domain;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 璁㈠崟鎺掍骇瀵硅薄 bs_order_scheduling
@@ -11,6 +25,11 @@
* @author jiang
* @date 2024-01-13
*/
+@Data
+@ExcelIgnoreUnannotated
+@ColumnWidth(16)
+@HeadRowHeight(14)
+@HeadFontStyle(fontHeightInPoints = 11)
public class BsOrderScheduling extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -20,34 +39,55 @@
/** 璁㈠崟缂栧彿 */
@Excel(name = "璁㈠崟缂栧彿")
+ @ExcelProperty(value = "璁㈠崟缂栧彿", index = 0)
private String orderNo;
/** 鍙戝姩鏈哄彿 */
- @Excel(name = "鍙戝姩鏈哄彿")
+ @Excel(name = "绠变綋缂栫爜")
+ @ExcelProperty(value = "绠变綋缂栫爜", index = 1)
private String engineNo;
+
+ @TableField(exist = false)
+ @ExcelIgnore
+ private List<String> engineNoList;
+
+ @TableField(exist = false)
+ @ExcelIgnore
+ private List<String> engineNoListExcel;
+
/** 浜у搧绫诲瀷 */
@Excel(name = "浜у搧绫诲瀷")
private String productType;
+ @ExcelProperty(value = "浜у搧绫诲瀷", index = 2)
+ private String productTypeString;
+
/** 鏈哄瀷 */
@Excel(name = "鏈哄瀷")
+ @ExcelProperty(value = "鏈哄瀷", index = 3)
private String model;
/** 鐢熶骇鐘舵�� */
@Excel(name = "鐢熶骇鐘舵��")
private String productionStatus;
+ @ExcelProperty(value = "鐢熶骇鐘舵��", index = 4)
+ private String productionStatusString;
+
/** 宸ユ椂 */
@Excel(name = "宸ユ椂")
+ @ExcelProperty(value = "宸ユ椂", index = 5)
private String workingHours;
/** 褰撳墠宸ヤ綅 */
@Excel(name = "褰撳墠宸ヤ綅")
+ @ExcelProperty(value = "褰撳墠宸ヤ綅", index = 6)
private String currentWorkstation;
/** 璐ㄩ噺鐘舵�� */
@Excel(name = "璐ㄩ噺鐘舵��")
+ @ExcelProperty(value = "璐ㄩ噺鐘舵��", index = 7)
private String qualityStatus;
/** 鏄惁鎵撳嵃 */
@@ -56,64 +96,218 @@
/** 10鎶ュ伐 */
@Excel(name = "10鎶ュ伐")
+ @ExcelIgnore
private String report10;
/** 20鎶ュ伐 */
@Excel(name = "20鎶ュ伐")
+ @ExcelIgnore
private String report20;
/** 鍚堢涓婄嚎 */
@Excel(name = "鍚堢涓婄嚎")
+ @ExcelIgnore
private String combinedBoxTime;
/** 鎬昏涓嬬嚎 */
@Excel(name = "鎬昏涓嬬嚎")
+ @ExcelIgnore
private String finalAssemblyTime;
/** 鎿嶄綔浜� */
@Excel(name = "鎿嶄綔浜�")
+ @ExcelProperty(value = "鎿嶄綔浜�", index = 14)
private String operator;
/** 鎿嶄綔鏃堕棿 */
@Excel(name = "鎿嶄綔鏃堕棿")
+ @ExcelProperty(value = "鎿嶄綔鏃堕棿", index = 15)
private String operateTime;
/** 鐘舵�� */
@Excel(name = "鐘舵��")
+ @ExcelIgnore
private String status;
/** 棰勭暀瀛楁1 */
@Excel(name = "棰勭暀瀛楁1")
+ @ExcelIgnore
private String spareField1;
/** 棰勭暀瀛楁2 */
@Excel(name = "棰勭暀瀛楁2")
+ @ExcelIgnore
private String spareField2;
/** 棰勭暀瀛楁3 */
@Excel(name = "棰勭暀瀛楁3")
+ @ExcelIgnore
private String spareField3;
/** 棰勭暀瀛楁4 */
@Excel(name = "棰勭暀瀛楁4")
+ @ExcelIgnore
private String spareField4;
/** 鍒涘缓鐢ㄦ埛 */
@Excel(name = "鍒涘缓鐢ㄦ埛")
+ @ExcelIgnore
private String createUser;
/** 鏇存敼鐢ㄦ埛 */
@Excel(name = "鏇存敼鐢ㄦ埛")
+ @ExcelIgnore
private String updateUser;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
+ @ExcelIgnore
private String remarks;
/** CVT鎶ュ伐 */
@Excel(name = "CVT鎶ュ伐")
+ @ExcelIgnore
private String report30;
+ @ExcelIgnore
+ private String[] dateConditions;
+
+ @ExcelIgnore
+ private String startTime;
+
+ @ExcelIgnore
+ private String endTime;
+
+ /** 鍚堢涓婄嚎鏃堕棿 */
+ @Excel(name = "鍚堢涓婄嚎鏃堕棿")
+ @ExcelProperty(value = "鍚堢涓婄嚎鏃堕棿", index = 8)
+ @com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date boxClosingOnlineTime;
+
+ /** 鍚堢涓嬬嚎鏃堕棿 */
+ @Excel(name = "鍚堢涓嬬嚎鏃堕棿")
+ @ExcelProperty(value = "鍚堢涓嬬嚎鏃堕棿", index = 9)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date closingBoxOfflineTime;
+
+ /** 鎬昏涓婄嚎鏃堕棿 */
+ @Excel(name = "鎬昏涓婄嚎鏃堕棿")
+ @ExcelProperty(value = "鎬昏涓婄嚎鏃堕棿", index =10)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finalAssemblyLaunchTime;
+
+ /** 鎬昏涓嬬嚎鏃堕棿 */
+ @Excel(name = "鎬昏涓嬬嚎鏃堕棿")
+ @ExcelProperty(value = "鎬昏涓嬬嚎鏃堕棿", index = 11)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finalAssemblyOfflineTime;
+
+ /** CVT涓婄嚎鏃堕棿 */
+ @Excel(name = "CVT涓婄嚎鏃堕棿")
+ @ExcelProperty(value = "CVT涓婄嚎鏃堕棿", index = 12)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cvtLaunchTime;
+
+ /** CVT涓嬬嚎鏃堕棿 */
+ @Excel(name = "CVT涓嬬嚎鏃堕棿")
+ @ExcelProperty(value = "CVT涓嬬嚎鏃堕棿", index = 13)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cvtOfflineTime;
+
+ @TableField(exist = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelIgnore
+ private LocalDateTime startQuery;
+
+ @TableField(exist = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelIgnore
+ private LocalDateTime endQuery;
+
+ @TableField(exist = false)
+ @ExcelIgnore
+ private String queryField;
+
+ public Date getBoxClosingOnlineTime() {
+ return boxClosingOnlineTime;
+ }
+
+ public void setBoxClosingOnlineTime(Date boxClosingOnlineTime) {
+ this.boxClosingOnlineTime = boxClosingOnlineTime;
+ }
+
+ public Date getClosingBoxOfflineTime() {
+ return closingBoxOfflineTime;
+ }
+
+ public void setClosingBoxOfflineTime(Date closingBoxOfflineTime) {
+ this.closingBoxOfflineTime = closingBoxOfflineTime;
+ }
+
+ public Date getFinalAssemblyLaunchTime() {
+ return finalAssemblyLaunchTime;
+ }
+
+ public void setFinalAssemblyLaunchTime(Date finalAssemblyLaunchTime) {
+ this.finalAssemblyLaunchTime = finalAssemblyLaunchTime;
+ }
+
+ public Date getFinalAssemblyOfflineTime() {
+ return finalAssemblyOfflineTime;
+ }
+
+ public void setFinalAssemblyOfflineTime(Date finalAssemblyOfflineTime) {
+ this.finalAssemblyOfflineTime = finalAssemblyOfflineTime;
+ }
+
+ public Date getCvtLaunchTime() {
+ return cvtLaunchTime;
+ }
+
+ public void setCvtLaunchTime(Date cvtLaunchTime) {
+ this.cvtLaunchTime = cvtLaunchTime;
+ }
+
+ public Date getCvtOfflineTime() {
+ return cvtOfflineTime;
+ }
+
+ public void setCvtOfflineTime(Date cvtOfflineTime) {
+ this.cvtOfflineTime = cvtOfflineTime;
+ }
+
+ public String[] getDateConditions() {
+ return dateConditions;
+ }
+
+ public void setDateConditions(String[] dateConditions) {
+ this.dateConditions = dateConditions;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public String getReport30() {
return report30;
}
--
Gitblit v1.9.3