change model3

wujian

2024-04-27 f4cb4dab73beecc4c03a52f8d971e007c9c287f9

 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();
    }
}