Merge remote-tracking branch 'origin/dev' into dev

bluejay

2025-04-14 db1be72e80a9532ceda5000d79c153eb859caa05

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java

@@ -121,7 +121,7 @@

    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private Integer isSuspended;
    private String isSuspended;

    /** 外协标识 */
    @Excel(name = "外协标识")
@@ -163,6 +163,10 @@
    /** 批次号 */
    @Excel(name = "批次号")
    private String batchNumber;

    /** 工厂 */
//    @Excel(name = "工厂")
    private String plant;

    public void setId(String id) 
    {
@@ -414,12 +418,12 @@
        return nextProcessDeparment;
    }

    public void setIsSuspended(Integer isSuspended) 
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }

    public Integer getIsSuspended() 
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -563,6 +567,14 @@
            .append("hasTurnback", getHasTurnback())
            .append("hasRisk", getHasRisk())
            .append("batchNumber", getBatchNumber())
            .append("plant", getPlant())
            .toString();
    }
    public String getPlant() {
        return plant;
    }

    public void setPlant(String plant) {
        this.plant = plant;
    }
}