Browse Source

添加设备指令是否NG

章政 7 years ago
parent
commit
55fb10fe1c
3 changed files with 19 additions and 8 deletions
  1. 17 6
      PLCDataReader/Main.Designer.cs
  2. 1 2
      PLCDataReader/Main.resx
  3. 1 0
      PLCDataReader/UAS_PLCDataReader.csproj

+ 17 - 6
PLCDataReader/Main.Designer.cs

@@ -239,6 +239,7 @@ namespace UAS_PLCDataReader
             this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
             this.TimerUpdateDevice = new System.Windows.Forms.Timer(this.components);
             this.TimerUpdateSQL = new System.Windows.Forms.Timer(this.components);
+            this.dc_ifng = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -1039,6 +1040,7 @@ namespace UAS_PLCDataReader
             this.dc_id,
             this.dc_code,
             this.dc_name,
+            this.dc_ifng,
             this.dc_type,
             this.dc_typename,
             this.dc_dataindex,
@@ -1060,7 +1062,7 @@ namespace UAS_PLCDataReader
             this.CommandSetCheckedColumn.FieldName = "CHECKEDCOLUMN";
             this.CommandSetCheckedColumn.Name = "CommandSetCheckedColumn";
             this.CommandSetCheckedColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.CommandSetCheckedColumn.Tag = "0";
+            this.CommandSetCheckedColumn.Tag = "1";
             this.CommandSetCheckedColumn.Visible = true;
             this.CommandSetCheckedColumn.VisibleIndex = 0;
             this.CommandSetCheckedColumn.Width = 39;
@@ -1117,7 +1119,7 @@ namespace UAS_PLCDataReader
             this.dc_dataindex.FieldName = "DC_DATAINDEX";
             this.dc_dataindex.Name = "dc_dataindex";
             this.dc_dataindex.Visible = true;
-            this.dc_dataindex.VisibleIndex = 4;
+            this.dc_dataindex.VisibleIndex = 5;
             this.dc_dataindex.Width = 62;
             // 
             // dc_value
@@ -1126,7 +1128,7 @@ namespace UAS_PLCDataReader
             this.dc_value.FieldName = "DC_VALUE";
             this.dc_value.Name = "dc_value";
             this.dc_value.Visible = true;
-            this.dc_value.VisibleIndex = 5;
+            this.dc_value.VisibleIndex = 6;
             this.dc_value.Width = 128;
             // 
             // dc_sendcoding
@@ -1159,7 +1161,7 @@ namespace UAS_PLCDataReader
             this.dc_man.Name = "dc_man";
             this.dc_man.OptionsColumn.AllowEdit = false;
             this.dc_man.Visible = true;
-            this.dc_man.VisibleIndex = 7;
+            this.dc_man.VisibleIndex = 8;
             this.dc_man.Width = 126;
             // 
             // dc_date
@@ -1171,7 +1173,7 @@ namespace UAS_PLCDataReader
             this.dc_date.Name = "dc_date";
             this.dc_date.OptionsColumn.AllowEdit = false;
             this.dc_date.Visible = true;
-            this.dc_date.VisibleIndex = 8;
+            this.dc_date.VisibleIndex = 9;
             this.dc_date.Width = 107;
             // 
             // repositoryItemDateEdit1
@@ -1189,7 +1191,7 @@ namespace UAS_PLCDataReader
             this.db_name.FieldName = "DB_NAME";
             this.db_name.Name = "db_name";
             this.db_name.Visible = true;
-            this.db_name.VisibleIndex = 6;
+            this.db_name.VisibleIndex = 7;
             this.db_name.Width = 47;
             // 
             // PageDeviceNetSetting
@@ -2388,6 +2390,14 @@ namespace UAS_PLCDataReader
             this.TimerUpdateSQL.Interval = 5000;
             this.TimerUpdateSQL.Tick += new System.EventHandler(this.TimerUpdateSQL_Tick);
             // 
+            // dc_ifng
+            // 
+            this.dc_ifng.Caption = "是否NG";
+            this.dc_ifng.FieldName = "DC_IFNG";
+            this.dc_ifng.Name = "dc_ifng";
+            this.dc_ifng.Visible = true;
+            this.dc_ifng.VisibleIndex = 4;
+            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -2678,5 +2688,6 @@ namespace UAS_PLCDataReader
         private CheckEdit CheckOUTQTY;
         private CheckEdit CheckPARAM;
         private CheckEdit CheckINQTY;
+        private DevExpress.XtraGrid.Columns.GridColumn dc_ifng;
     }
 }

+ 1 - 2
PLCDataReader/Main.resx

@@ -142,8 +142,7 @@
         I/oQfTU8rsDXPPYoYSlClFeL0KmimDx5RHq5KT7rUmXiwRqoJDzUXkZ81sWq8LRSd9JzoXIRorxahE4V
         xXh5+6774mLrqYZOmO/+KdNw9z4auu7D3EV9bql/qrETrCN9PyVOmFeL0KmiGCfqvzqzCpfaf0fFjXso
         vd6Fkz/fQxlDfeZMy2/4of0PhGdUcaAVwY9MmFeL0KmiGCcasOi90yhrvIOc2l+RW9eB/PoOFFztREE9
-        QW0+tRVNd7AwpYIDBxH8WxDm1SJ0qijGiZ7021KGzG9uYHvpT/iY2r
-        bmF/dRv2VbYi4/xN7K64js/O
+        QW0+tRVNd7AwpYIDBxH8WxDm1SJ0qijGiZ7021KGzG9uYHvpT/iY2r0XbmF/dRv2VbYi4/xN7K64js/O
         tWDOppMcOITg34EwrxahU0UxLmCwz8ZSpFU0Y0NBPTYVXsOWIjOSis1ILm4gzHI//VQzvDeUcOAwgt8I
         YV4tQqeKYnwnQ7wo8bYTTYjLuYKEvHpsyL+KjVQI807hVbm/o6QJsxOOc+AIQrcCONGwWfHHkVR0DesO
         1yE2uw7rqZC4XA3UT6ZVcF9/jAOfJnhfEObVInSqKMYrMNw99hgS864g4kANog79iOhDtVh7uJYKegD3

+ 1 - 0
PLCDataReader/UAS_PLCDataReader.csproj

@@ -328,6 +328,7 @@
     <EmbeddedResource Include="MainWindow.resx">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>