From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001 From: liuying <1427574514@qq.com> Date: 周三, 24 9月 2025 15:31:07 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 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 e42c88f..5760337 100644 --- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs +++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceProcess.cs @@ -66,6 +66,10 @@ [StringLength(255)] public string Remarks { get; set; } + + [StringLength(255)] + public string MyRemarks { get; set; } + public bool IsDeleted { get; set; } /// <summary> @@ -89,5 +93,16 @@ [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