From bbc5784cc34d65e64d639d949e75b978fe07bdb3 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 06 五月 2024 12:30:48 +0800
Subject: [PATCH] 更新首页
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 354 insertions(+), 21 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 2347f53..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,50 +1,93 @@
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
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
+@Data
+@ExcelIgnoreUnannotated
+@ColumnWidth(16)
+@HeadRowHeight(14)
+@HeadFontStyle(fontHeightInPoints = 11)
public class BsOrderScheduling extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ /** ID */
+ private Long id;
+
/** 璁㈠崟缂栧彿 */
@Excel(name = "璁㈠崟缂栧彿")
- private String orderNumber;
+ @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;
/** 鏄惁鎵撳嵃 */
@@ -53,36 +96,243 @@
/** 10鎶ュ伐 */
@Excel(name = "10鎶ュ伐")
+ @ExcelIgnore
private String report10;
/** 20鎶ュ伐 */
@Excel(name = "20鎶ュ伐")
+ @ExcelIgnore
private String report20;
/** 鍚堢涓婄嚎 */
@Excel(name = "鍚堢涓婄嚎")
- private String combinedBoxLaunch;
+ @ExcelIgnore
+ private String combinedBoxTime;
/** 鎬昏涓嬬嚎 */
@Excel(name = "鎬昏涓嬬嚎")
- private String finalAssemblyOffline;
+ @ExcelIgnore
+ private String finalAssemblyTime;
/** 鎿嶄綔浜� */
@Excel(name = "鎿嶄綔浜�")
+ @ExcelProperty(value = "鎿嶄綔浜�", index = 14)
private String operator;
/** 鎿嶄綔鏃堕棿 */
@Excel(name = "鎿嶄綔鏃堕棿")
+ @ExcelProperty(value = "鎿嶄綔鏃堕棿", index = 15)
private String operateTime;
- public void setOrderNumber(String orderNumber)
- {
- this.orderNumber = orderNumber;
+ /** 鐘舵�� */
+ @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 String getOrderNumber()
+ 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;
+ }
+
+ public void setReport30(String report30) {
+ this.report30 = report30;
+ }
+
+ public void setId(Long id)
{
- return orderNumber;
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setOrderNo(String orderNo)
+ {
+ this.orderNo = orderNo;
+ }
+
+ public String getOrderNo()
+ {
+ return orderNo;
}
public void setEngineNo(String engineNo)
{
@@ -174,23 +424,23 @@
{
return report20;
}
- public void setCombinedBoxLaunch(String combinedBoxLaunch)
+ public void setCombinedBoxTime(String combinedBoxTime)
{
- this.combinedBoxLaunch = combinedBoxLaunch;
+ this.combinedBoxTime = combinedBoxTime;
}
- public String getCombinedBoxLaunch()
+ public String getCombinedBoxTime()
{
- return combinedBoxLaunch;
+ return combinedBoxTime;
}
- public void setFinalAssemblyOffline(String finalAssemblyOffline)
+ public void setFinalAssemblyTime(String finalAssemblyTime)
{
- this.finalAssemblyOffline = finalAssemblyOffline;
+ this.finalAssemblyTime = finalAssemblyTime;
}
- public String getFinalAssemblyOffline()
+ public String getFinalAssemblyTime()
{
- return finalAssemblyOffline;
+ return finalAssemblyTime;
}
public void setOperator(String operator)
{
@@ -210,11 +460,84 @@
{
return operateTime;
}
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+ public void setSpareField1(String spareField1)
+ {
+ this.spareField1 = spareField1;
+ }
+
+ public String getSpareField1()
+ {
+ return spareField1;
+ }
+ public void setSpareField2(String spareField2)
+ {
+ this.spareField2 = spareField2;
+ }
+
+ public String getSpareField2()
+ {
+ return spareField2;
+ }
+ public void setSpareField3(String spareField3)
+ {
+ this.spareField3 = spareField3;
+ }
+
+ public String getSpareField3()
+ {
+ return spareField3;
+ }
+ public void setSpareField4(String spareField4)
+ {
+ this.spareField4 = spareField4;
+ }
+
+ public String getSpareField4()
+ {
+ return spareField4;
+ }
+ public void setCreateUser(String createUser)
+ {
+ this.createUser = createUser;
+ }
+
+ public String getCreateUser()
+ {
+ return createUser;
+ }
+ public void setUpdateUser(String updateUser)
+ {
+ this.updateUser = updateUser;
+ }
+
+ public String getUpdateUser()
+ {
+ return updateUser;
+ }
+ public void setRemarks(String remarks)
+ {
+ this.remarks = remarks;
+ }
+
+ public String getRemarks()
+ {
+ return remarks;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("orderNumber", getOrderNumber())
+ .append("id", getId())
+ .append("orderNo", getOrderNo())
.append("engineNo", getEngineNo())
.append("productType", getProductType())
.append("model", getModel())
@@ -225,10 +548,20 @@
.append("whetherOrPrint", getWhetherOrPrint())
.append("report10", getReport10())
.append("report20", getReport20())
- .append("combinedBoxLaunch", getCombinedBoxLaunch())
- .append("finalAssemblyOffline", getFinalAssemblyOffline())
+ .append("combinedBoxTime", getCombinedBoxTime())
+ .append("finalAssemblyTime", getFinalAssemblyTime())
.append("operator", getOperator())
.append("operateTime", getOperateTime())
+ .append("status", getStatus())
+ .append("spareField1", getSpareField1())
+ .append("spareField2", getSpareField2())
+ .append("spareField3", getSpareField3())
+ .append("spareField4", getSpareField4())
+ .append("createUser", getCreateUser())
+ .append("createTime", getCreateTime())
+ .append("updateUser", getUpdateUser())
+ .append("updateTime", getUpdateTime())
+ .append("remarks", getRemarks())
.toString();
}
}
--
Gitblit v1.9.3