From dbb2a464d215efcda6c0761b0574e9d9d6e9f24d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 17 10月 2024 15:35:19 +0800
Subject: [PATCH] 整改
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
index 45d564d..5760337 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs
@@ -27,7 +27,20 @@
[Column(TypeName = "datetime2")]
public DateTime EndTime { get; set; }
+ /// <summary>
+ /// 质量状态，使用枚举 QualityState
+ /// </summary>
public int QualityState { get; set; }
+
+ /// <summary>
+ /// 质量不合格原因类型，枚举QualityNoOkEnum 【Editby shaocx,2024-06-26】
+ /// </summary>
+ public int? QualityNoOk { get; set; }
+
+ /// <summary>
+ /// 质量不合格原因 【Editby shaocx,2024-06-26】
+ /// </summary>
+ public string QualityNoOkReason { get; set; }
public long QualityDataInfoID { get; set; }
@@ -44,12 +57,52 @@
[StringLength(50)]
public string UpdatedUserName { get; set; }
-
+
+ /// <summary>
+ /// 操作类型，使用枚举 OperationType
+ /// </summary>
[StringLength(50)]
public string OperationType { get; set; }
[StringLength(255)]
public string Remarks { get; set; }
+
+ [StringLength(255)]
+ public string MyRemarks { get; set; }
+
public bool IsDeleted { get; set; }
+
+ /// <summary>
+ /// 获取QC数据标记,0表示待获取，1表示获取成功，2表示获取失败 【Editby shaocx,2024-06-15】
+ /// </summary>
+ public int? GetQcDataFlag { get; set; }
+
+ /// <summary>
+ /// 获取QC数据标记次数 【Editby shaocx,2024-06-15】
+ /// </summary>
+ public int? GetQcDataCount { get; set; }
+
+ /// <summary>
+ /// 获取QC数据标记描述 【Editby shaocx,2024-06-15】
+ /// </summary>
+ public string GetQcDataFlag_Remark { get; set; }
+
+
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
+
+ /// <summary>
+ /// 需要更新70质量数据的标记 （ 1：需要更新 2：不需要更新）
+ /// </summary>
+ public int? Update70Flag { get; set; }
+
+
+ /// <summary>
+ /// 夹具工位 [Editby shaocx,2024-09-11]
+ /// </summary>
+ public string JiaJuGongWei { get; set; }
}
}
--
Gitblit v1.9.3