From 927deebbdd29dbf135695dd76a2521abc360592b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 9月 2024 13:38:29 +0800
Subject: [PATCH] 修复肤质
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 64 ++++++++++++++++----------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs | 2
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
index c391f66..98908f3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/2_QualityInfoCompleteManager.cs
@@ -304,7 +304,7 @@
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
- process.JiaJuGongWei = process.JiaJuGongWei;
+ process.JiaJuGongWei = logMiddle.JiaJuGongWei;
process.DataCapturePointCname = logMiddle.DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = WorkPieceInfoManager.ResetUpdatedUserName(logMiddle);
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index 3104246..46a51a3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1887,40 +1887,40 @@
// break;
//#region 02 娴嬮噺瀹屾垚鏍囪
//case "OP2002A":
- //case "OP2002B":
- //case "OP2002C":
- //case "OP3002CH3":
- //case "OP3002CH4":
- //case "OP3002CH5":
- //case "OP3002CH6":
- //case "OP3502A":
- //case "OP3502B":
- //case "OP6002A":
- //case "OP6002B":
- //case "OP6002C":
- //case "OP6002D":
- //case "OP3502":
- // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
- // dc02._dataCaptureConfig = config;
- // _dataCaptureHandler.Add(dc02);
- // break;
+ //case "OP2002B":
+ case "OP2002C":
+ //case "OP3002CH3":
+ //case "OP3002CH4":
+ //case "OP3002CH5":
+ //case "OP3002CH6":
+ //case "OP3502A":
+ //case "OP3502B":
+ //case "OP6002A":
+ //case "OP6002B":
+ //case "OP6002C":
+ //case "OP6002D":
+ //case "OP3502":
+ DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
+ dc02._dataCaptureConfig = config;
+ _dataCaptureHandler.Add(dc02);
+ break;
//#region 01 浜岀淮鐮佽鍙�
- case "OP3001":
- //case "OP3501":
- //case "OP5001A":
- //case "OP5001B":
- //case "OP6001":
- //case "OP7001":
- //case "OP8001":
- DataCaptureHandler_01 dc01 = new DataCaptureHandler_01();
- dc01._dataCaptureConfig = config;
- _dataCaptureHandler.Add(dc01);
- break;
- case "OP0501":
- DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
- _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
- break;
+ //case "OP3001":
+ //case "OP3501":
+ //case "OP5001A":
+ //case "OP5001B":
+ //case "OP6001":
+ //case "OP7001":
+ //case "OP8001":
+ //DataCaptureHandler_01 dc01 = new DataCaptureHandler_01();
+ //dc01._dataCaptureConfig = config;
+ //_dataCaptureHandler.Add(dc01);
+ //break;
+ //case "OP0501":
+ //DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
+ //_dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
+ //break;
#endregion
//case "OP7009"://娓呮礂鏈鸿幏鍙栭噰闆嗘暟鎹�
// DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;
--
Gitblit v1.9.3