From 5eda9ebc27193dfdbe5941499bf213815d1e98f6 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期日, 12 五月 2024 17:00:26 +0800 Subject: [PATCH] 点位订阅 --- jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java index 7fdb98d..fec6e50 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java @@ -142,6 +142,10 @@ @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂�") private String orderStatus; + /** 鍒涘缓鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** 鍒涘缓浜� */ @Excel(name = "鍒涘缓浜�") private String createUser; @@ -164,7 +168,7 @@ /** 甯傚満鍖哄煙缂栫爜 */ @Excel(name = "甯傚満鍖哄煙缂栫爜") - private String marketAreaCode; + private String materialCode; /** 杞欢鐗堟湰缂栫爜 */ @Excel(name = "杞欢鐗堟湰缂栫爜") @@ -191,6 +195,17 @@ @TableField(exist = false) private String flag; + + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } public String getProductModel() { return productModel; @@ -526,16 +541,16 @@ { return custom; } - public void setMarketAreaCode(String marketAreaCode) - { - this.marketAreaCode = marketAreaCode; + + public String getMaterialCode() { + return materialCode; } - public String getMarketAreaCode() - { - return marketAreaCode; + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; } - public void setSoftwareVersionCode(String softwareVersionCode) + + public void setSoftwareVersionCode(String softwareVersionCode) { this.softwareVersionCode = softwareVersionCode; } @@ -624,7 +639,6 @@ .append("remarks", getRemarks()) .append("streamNumber", getStreamNumber()) .append("custom", getCustom()) - .append("marketAreaCode", getMarketAreaCode()) .append("softwareVersionCode", getSoftwareVersionCode()) .append("productCompanyCode", getProductCompanyCode()) .append("spareField2", getSpareField2()) -- Gitblit v1.9.3