From 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 24 六月 2024 19:00:22 +0800
Subject: [PATCH] 1，优化人工工位参数采集temp表删除方法 pushGeelycvMesFeedback 2，优化人工工位更新过站记录方法 workpieceRelease 3，优化未绑定小车码弹框提示 4，优化人工工位扫码重复会添加参数采集记录的问题及拧紧数据会添加上物料采集上的问题
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 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 d8d7fd8..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 = "杞欢鐗堟湰缂栫爜")
@@ -175,7 +179,7 @@
private String productCompanyCode;
/** 棰勭暀瀛楁1 */
- private String spareField1;
+ private String trolleyYard;
/** 棰勭暀瀛楁2 */
private String spareField2;
@@ -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;
}
@@ -553,16 +568,16 @@
{
return productCompanyCode;
}
- public void setSpareField1(String spareField1)
- {
- this.spareField1 = spareField1;
+
+ public String getTrolleyYard() {
+ return trolleyYard;
}
- public String getSpareField1()
- {
- return spareField1;
+ public void setTrolleyYard(String trolleyYard) {
+ this.trolleyYard = trolleyYard;
}
- public void setSpareField2(String spareField2)
+
+ public void setSpareField2(String spareField2)
{
this.spareField2 = spareField2;
}
@@ -624,10 +639,8 @@
.append("remarks", getRemarks())
.append("streamNumber", getStreamNumber())
.append("custom", getCustom())
- .append("marketAreaCode", getMarketAreaCode())
.append("softwareVersionCode", getSoftwareVersionCode())
.append("productCompanyCode", getProductCompanyCode())
- .append("spareField1", getSpareField1())
.append("spareField2", getSpareField2())
.append("spareField3", getSpareField3())
.append("spareField4", getSpareField4())
--
Gitblit v1.9.3