From 09a12e1094e90fe83c5578de64b56e9237c60507 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:13:33 +0800
Subject: [PATCH] 代码回归
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 163 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 19 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index db6e273..4bbc8c8 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -38,7 +39,7 @@
/// <summary>
/// 鍦ㄥ埗鍝�
/// </summary>
- WIP=1,
+ WIP = 1,
/// <summary>
/// 鎺ㄥ嚭
/// </summary>
@@ -64,21 +65,67 @@
/// <summary>
/// 璐ㄩ噺鐘舵��
/// </summary>
- public enum QualityState
+ public enum QualityStateEnum
{
/// <summary>
/// 鍚堟牸
/// </summary>
- OK=1,
+ [Description("鍚堟牸")]
+ OK = 1,
/// <summary>
/// 涓嶅悎鏍�
/// </summary>
- NG=2,
+ [Description("涓嶅悎鏍�")]
+ NG = 2,
/// <summary>
/// 鐤戜技
/// </summary>
- Suspected=3
+ [Description("鐤戜技")]
+ Suspected = 3
}
+
+ /// <summary>
+ /// 涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-06-26銆�
+ /// </summary>
+ public enum QualityNoOkEnum
+ {
+
+
+ OP10鍘氬害瓒呭樊 = 2,
+ OP20灏忓ご瀛旂洿寰勮秴宸� = 3,
+ OP30娑ㄦ柇宸ヤ綅鍔涚煩瓒呭樊 = 4,
+ OP35婊氬帇鍔涜秴宸� = 5,
+ OP40鍘氬害瓒呭樊 = 6,
+ OP60灏忓ご瀛旂洿寰勮秴宸� = 8,
+ OP80灏哄瓒呭樊 = 10,
+ OP30棰勬嫥绱у伐浣嶅姏鐭╄秴宸� = 11,
+ OP30缁堟嫥绱у伐浣嶅姏鐭╄秴宸� = 12,
+ OP30鍘嬭‖濂楀伐浣嶅姏鐭╄秴宸� = 13,
+ OP60澶уご瀛旂洿寰勮秴宸� = 14,
+ OP80閲嶉噺瓒呭樊 = 15,
+
+ OP80澶уご瀛旂洿寰勮秴宸� = 16,
+ OP80灏忓ご瀛旂洿寰勮秴宸� = 17,
+ OP80涓績璺濊秴宸� = 18,
+ OP80澶уご瀛斿渾鏌卞害瓒呭樊 = 19,
+ OP80灏忓ご瀛斿渾搴︿笂闈㈣秴宸� = 20,
+ OP80灏忓ご瀛斿渾搴︿笅闈㈣秴宸� = 21,
+ OP80灏忓ご瀛斿钩琛屽害鎵洸瓒呭樊 = 22,
+ OP80灏忓ご瀛斿钩琛屽害寮洸瓒呭樊 = 23,
+ OP80澶уご瀛斿瀭鐩村害瓒呭樊 = 24,
+ OP80灏忓ご瀛斿瀭鐩村害瓒呭樊 = 25,
+ OP80鍘氬害瓒呭樊 = 26,
+ OP80澶уご绔噸閲忚秴宸� = 27,
+ OP80灏忓ご绔噸閲忚秴宸� = 28,
+
+
+ OP80鎵撴爣涓嶅悎鏍� = 30,
+ OP80鎵撴爣璇嗗埆涓嶅悎鏍� = 31,
+ OP80绉伴噸涓嶅悎鏍� = 32,
+ OP80娴嬮噺涓嶅悎鏍� = 33,
+
+ }
+
/// <summary>
/// 璐ㄩ噺鐘舵�佷慨鏀规柟寮�
/// </summary>
@@ -87,11 +134,11 @@
/// <summary>
/// 鎵嬪姩
/// </summary>
- Manual=1,
+ Manual = 1,
/// <summary>
/// 鑷姩
/// </summary>
- Auto= 2,
+ Auto = 2,
/// <summary>
/// 鑷姩
/// </summary>
@@ -108,7 +155,7 @@
/// </summary>
Online = 2
}
-
+
public enum EDbError
{
璁板綍宸插瓨鍦� = -2146233087
@@ -136,7 +183,7 @@
/// <summary>
/// 涓荤晫闈㈠紓甯�
/// </summary>
- FormMain=1,
+ FormMain = 1,
#region PLC閲囬泦 宸ュ簭鐩稿叧
PLCOP05 = 10,
@@ -150,6 +197,10 @@
PLCOP70 = 18,
PLCOP80 = 19,
PLCHMI = 20,
+ /// <summary>
+ /// OP80鐨勮川閲忔暟鎹噰闆� 銆怑ditby shaocx,2024-06-16銆�
+ /// </summary>
+ PLCOP80_QC = 21,
#endregion
#region PLC鐩稿叧
@@ -171,22 +222,96 @@
#endregion
+ /// <summary>
+ /// 瀹氭椂鍒犻櫎鏁版嵁
+ /// </summary>
+ DeleteData = 500,
+ /// <summary>
+ /// 娓呮礂鏈洪噰闆嗘暟鎹�
+ /// </summary>
+ OP7009 = 503,
+
+ /// <summary>
+ /// 鐩戞帶娴嬭瘯鏁版嵁
+ /// </summary>
+ MonitorTest = 504,
+
+ /// <summary>
+ /// 鐩戞帶OP50鍝釜闈�
+ /// </summary>
+ MonitorOP50Side = 505,
+
+
+ //鏂板 銆怑ditby shaocx,2024-08-31銆�
+ /// <summary>
+ /// 鍏朵粬涓婄嚎
+ /// </summary>
+ OtherOnLine = 509,
+
+ /// <summary>
+ /// OP5001A
+ /// </summary>
+ OP5001A = 510,
+ /// <summary>
+ /// OP5001B
+ /// </summary>
+ OP5001B = 511,
+
+ /// <summary>
+ /// OP3001
+ /// </summary>
+ OP3001 = 512,
+
+ /// <summary>
+ /// OP3501
+ /// </summary>
+ OP3501 = 513,
+
+ /// <summary>
+ /// OP6001
+ /// </summary>
+ OP6001 = 514,
+
+ /// <summary>
+ /// OP7001
+ /// </summary>
+ OP7001 = 515,
+
+ /// <summary>
+ /// OP8001
+ /// </summary>
+ OP8001 = 516,
+
+ /// <summary>
+ /// OP1002
+ /// </summary>
+ OP1002 = 518,
+
+ /// <summary>
+ /// OP1003
+ /// </summary>
+ OP1003 = 519,
+
+
+ OP2002A = 520,
+ OP2002B = 521,
+ OP2002C = 522,
}
public enum WorkingProcedureForHMI
{
- OP05=1,
- OP10=2,
- OP20=3,
- OP30=4,
- OP35=5,
- OP40=6,
- OP50=7,
- OP60=8,
- OP70=9,
- OP80=10,
+ OP05 = 1,
+ OP10 = 2,
+ OP20 = 3,
+ OP30 = 4,
+ OP35 = 5,
+ OP40 = 6,
+ OP50 = 7,
+ OP60 = 8,
+ OP70 = 9,
+ OP80 = 10,
}
public enum FeedbackMode
--
Gitblit v1.9.3