Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-出货标签管理/App.config

@@ -53,6 +53,12 @@
       <setting name="FTPAddress" serializeAs="String">
         <value>ftp://218.18.115.198:21|Print|Administrator1@#</value>
       </setting>
+      <setting name="MidBoxCapacity" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="OutboxCapacity" serializeAs="String">
+        <value>0</value>
+      </setting>
     </UAS_LabelMachine.Properties.Settings>
   </userSettings>
 </configuration>

UAS-出货标签管理/CustomControl/SearchTextBox.cs

@@ -338,6 +338,7 @@ namespace UAS_LabelMachine.CustomControl
             }
             try
             {
+                Console.WriteLine(sql);
                 dt = (DataTable)dh.ExecuteSql(sql, "select");
                 if (dt.Rows.Count > 0)
                     ReturnDataToForm();

UAS-出货标签管理/Properties/Settings.settings

@@ -17,5 +17,11 @@
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
       <Value Profile="(Default)">ftp://218.18.115.198:21|Print|Administrator1@#</Value>
     </Setting>
+    <Setting Name="MidBoxCapacity" Type="System.Decimal" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="OutboxCapacity" Type="System.Decimal" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

UAS-出货标签管理/Properties/Settings1.Designer.cs

@@ -82,5 +82,29 @@ namespace UAS_LabelMachine.Properties {
                 this["FTPAddress"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public decimal MidBoxCapacity {
+            get {
+                return ((decimal)(this["MidBoxCapacity"]));
+            }
+            set {
+                this["MidBoxCapacity"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public decimal OutboxCapacity {
+            get {
+                return ((decimal)(this["OutboxCapacity"]));
+            }
+            set {
+                this["OutboxCapacity"] = value;
+            }
+        }
     }
 }

UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -1058,16 +1058,24 @@ namespace UAS_LabelMachine
         /// <param name="param"></param>
         public void CallProcedure(string ProcedureName, params string[] param)
         {
-            command.CommandText = "Execute " + ProcedureName;
-            if (param[0].Length > 0)
+            command = new OracleCommand(ProcedureName);
+            command.Connection = connection;
+            command.CommandText = ProcedureName;
+            command.CommandType = CommandType.StoredProcedure;
+            for (int i = 0; i < param.Length; i++)
+                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
+            try
             {
-                command.ArrayBindCount = param[1].Length;
-                for (int i = 1; i <= param[0].Length; i++)
-                {
-                    command.Parameters.Add(new OracleParameter(param[0][i - 1].ToString(), OracleDbType.Varchar2, param[i], ParameterDirection.Input));
-                }
+                command.ExecuteNonQuery();
             }
-            command.ExecuteNonQuery();
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
+            for (int i = 0; i < command.Parameters.Count; i++)
+                param[i] = command.Parameters[i].Value.ToString();
             command.Dispose();
         }
 

UAS-出货标签管理/UAS_出货标签管理.Designer.cs

@@ -92,6 +92,8 @@
             this.MidSource = new System.Windows.Forms.BindingSource();
             this.ChooseAll = new System.Windows.Forms.Button();
             this.ExportFileDialog = new System.Windows.Forms.FolderBrowserDialog();
+            this.AttachInfo = new System.Windows.Forms.Button();
+            this.pi_date = new System.Windows.Forms.Label();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ExportData = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
@@ -130,6 +132,8 @@
             this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -138,9 +142,11 @@
             this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -176,8 +182,6 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.AttachInfo = new System.Windows.Forms.Button();
-            this.pi_date = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -527,6 +531,10 @@
             this.PowerSetting.Visible = false;
             this.PowerSetting.Click += new System.EventHandler(this.PowerSetting_Click);
             // 
+            // RefreshDBConnect
+            // 
+            this.RefreshDBConnect.Tick += new System.EventHandler(this.RefreshDBConnect_Tick);
+            // 
             // GetGridOnly
             // 
             this.GetGridOnly.AutoSize = true;
@@ -756,6 +764,28 @@
             this.ChooseAll.UseVisualStyleBackColor = true;
             this.ChooseAll.Click += new System.EventHandler(this.ChooseAll_Click);
             // 
+            // AttachInfo
+            // 
+            this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.AttachInfo.Location = new System.Drawing.Point(230, 141);
+            this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.AttachInfo.Name = "AttachInfo";
+            this.AttachInfo.Size = new System.Drawing.Size(88, 26);
+            this.AttachInfo.TabIndex = 85;
+            this.AttachInfo.Text = "附加信息设置";
+            this.AttachInfo.UseVisualStyleBackColor = true;
+            this.AttachInfo.Click += new System.EventHandler(this.AttachInfo_Click);
+            // 
+            // pi_date
+            // 
+            this.pi_date.AutoSize = true;
+            this.pi_date.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pi_date.Location = new System.Drawing.Point(5, 158);
+            this.pi_date.Name = "pi_date";
+            this.pi_date.Size = new System.Drawing.Size(0, 20);
+            this.pi_date.TabIndex = 86;
+            this.pi_date.Visible = false;
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Controls.Add(this.ExportData);
@@ -780,7 +810,7 @@
             // 
             this.ExportData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ExportData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ExportData.Location = new System.Drawing.Point(74, 202);
+            this.ExportData.Location = new System.Drawing.Point(76, 200);
             this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ExportData.Name = "ExportData";
             this.ExportData.Size = new System.Drawing.Size(68, 26);
@@ -793,7 +823,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(68, 149);
+            this.label18.Location = new System.Drawing.Point(68, 147);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -827,7 +857,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(67, 75);
+            this.label16.Location = new System.Drawing.Point(67, 74);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -861,7 +891,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(12, 113);
+            this.label12.Location = new System.Drawing.Point(12, 111);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
             this.label12.TabIndex = 77;
@@ -871,7 +901,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(12, 39);
+            this.label7.Location = new System.Drawing.Point(12, 38);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 76;
@@ -924,7 +954,7 @@
             // 
             this.Capacity.AutoSize = true;
             this.Capacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Capacity.Location = new System.Drawing.Point(60, 66);
+            this.Capacity.Location = new System.Drawing.Point(60, 64);
             this.Capacity.Name = "Capacity";
             this.Capacity.Size = new System.Drawing.Size(0, 17);
             this.Capacity.TabIndex = 75;
@@ -933,7 +963,7 @@
             // 
             this.Process_midboxcode.AutoSize = true;
             this.Process_midboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_midboxcode.Location = new System.Drawing.Point(60, 110);
+            this.Process_midboxcode.Location = new System.Drawing.Point(60, 109);
             this.Process_midboxcode.Name = "Process_midboxcode";
             this.Process_midboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_midboxcode.TabIndex = 74;
@@ -943,7 +973,7 @@
             // 
             this.Process_outboxcode.AutoSize = true;
             this.Process_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_outboxcode.Location = new System.Drawing.Point(60, 86);
+            this.Process_outboxcode.Location = new System.Drawing.Point(60, 85);
             this.Process_outboxcode.Name = "Process_outboxcode";
             this.Process_outboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_outboxcode.TabIndex = 73;
@@ -954,7 +984,7 @@
             this.TotalCount.AutoSize = true;
             this.TotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.TotalCount.ForeColor = System.Drawing.Color.Blue;
-            this.TotalCount.Location = new System.Drawing.Point(94, 18);
+            this.TotalCount.Location = new System.Drawing.Point(94, 16);
             this.TotalCount.Name = "TotalCount";
             this.TotalCount.Size = new System.Drawing.Size(15, 17);
             this.TotalCount.TabIndex = 72;
@@ -964,7 +994,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(81, 18);
+            this.label17.Location = new System.Drawing.Point(81, 16);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(13, 17);
             this.label17.TabIndex = 71;
@@ -975,7 +1005,7 @@
             this.CollectedCount.AutoSize = true;
             this.CollectedCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CollectedCount.ForeColor = System.Drawing.Color.Red;
-            this.CollectedCount.Location = new System.Drawing.Point(63, 18);
+            this.CollectedCount.Location = new System.Drawing.Point(63, 16);
             this.CollectedCount.Name = "CollectedCount";
             this.CollectedCount.Size = new System.Drawing.Size(15, 17);
             this.CollectedCount.TabIndex = 70;
@@ -985,7 +1015,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(10, 87);
+            this.label14.Location = new System.Drawing.Point(10, 86);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(32, 17);
             this.label14.TabIndex = 69;
@@ -995,7 +1025,7 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(10, 110);
+            this.label11.Location = new System.Drawing.Point(10, 109);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(32, 17);
             this.label11.TabIndex = 68;
@@ -1005,7 +1035,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(10, 46);
+            this.label13.Location = new System.Drawing.Point(10, 45);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(44, 17);
             this.label13.TabIndex = 67;
@@ -1015,7 +1045,7 @@
             // 
             this.Installed.AutoSize = true;
             this.Installed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Installed.Location = new System.Drawing.Point(60, 46);
+            this.Installed.Location = new System.Drawing.Point(60, 45);
             this.Installed.Name = "Installed";
             this.Installed.Size = new System.Drawing.Size(0, 17);
             this.Installed.TabIndex = 66;
@@ -1024,7 +1054,7 @@
             // 
             this.Process.AutoSize = true;
             this.Process.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process.Location = new System.Drawing.Point(10, 18);
+            this.Process.Location = new System.Drawing.Point(10, 16);
             this.Process.Name = "Process";
             this.Process.Size = new System.Drawing.Size(44, 17);
             this.Process.TabIndex = 65;
@@ -1115,6 +1145,8 @@
             this.pr_vendprodcode,
             this.pib_brand,
             this.pib_madein,
+            this.pr_zxbzs,
+            this.pr_unit,
             this.pib_lotno,
             this.pib_datecode,
             this.pib_cusbarcode,
@@ -1123,9 +1155,11 @@
             this.pib_qty,
             this.pib_barcode,
             this.pib_custbarcode,
+            this.pib_custoutboxcode,
             this.pd_pocode,
             this.pd_custprodcode,
             this.pd_custprodspec,
+            this.pr_spec,
             this.pib_outboxcode1,
             this.pib_outboxcode2});
             this.LabelInf.Location = new System.Drawing.Point(2, 252);
@@ -1212,6 +1246,22 @@
             this.pib_madein.Name = "pib_madein";
             this.pib_madein.Width = 54;
             // 
+            // pr_zxbzs
+            // 
+            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
+            this.pr_zxbzs.HeaderText = "最小包装数";
+            this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.Visible = false;
+            this.pr_zxbzs.Width = 90;
+            // 
+            // pr_unit
+            // 
+            this.pr_unit.DataPropertyName = "pr_unit";
+            this.pr_unit.HeaderText = "单位";
+            this.pr_unit.Name = "pr_unit";
+            this.pr_unit.Visible = false;
+            this.pr_unit.Width = 54;
+            // 
             // pib_lotno
             // 
             this.pib_lotno.DataPropertyName = "pib_lotno";
@@ -1271,6 +1321,13 @@
             this.pib_custbarcode.Name = "pib_custbarcode";
             this.pib_custbarcode.Width = 78;
             // 
+            // pib_custoutboxcode
+            // 
+            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
+            this.pib_custoutboxcode.HeaderText = "外箱条码";
+            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
+            this.pib_custoutboxcode.Width = 78;
+            // 
             // pd_pocode
             // 
             this.pd_pocode.DataPropertyName = "pd_pocode";
@@ -1295,6 +1352,14 @@
             this.pd_custprodspec.ReadOnly = true;
             this.pd_custprodspec.Width = 78;
             // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Visible = false;
+            this.pr_spec.Width = 54;
+            // 
             // pib_outboxcode1
             // 
             this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -1345,7 +1410,7 @@
             // 
             this.ViVoPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ViVoPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ViVoPlate.Location = new System.Drawing.Point(80, 166);
+            this.ViVoPlate.Location = new System.Drawing.Point(77, 165);
             this.ViVoPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ViVoPlate.Name = "ViVoPlate";
             this.ViVoPlate.Size = new System.Drawing.Size(68, 26);
@@ -1367,7 +1432,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 202);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(77, 200);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1380,7 +1445,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(8, 109);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(8, 107);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1438,7 +1503,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(6, 166);
+            this.label5.Location = new System.Drawing.Point(6, 165);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(32, 17);
             this.label5.TabIndex = 50;
@@ -1448,7 +1513,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(6, 137);
+            this.label4.Location = new System.Drawing.Point(6, 135);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(32, 17);
             this.label4.TabIndex = 49;
@@ -1467,7 +1532,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(93, 136);
+            this.label15.Location = new System.Drawing.Point(102, 134);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(20, 17);
             this.label15.TabIndex = 40;
@@ -1479,8 +1544,9 @@
             this.MidBoxCapacity.Location = new System.Drawing.Point(52, 135);
             this.MidBoxCapacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidBoxCapacity.Name = "MidBoxCapacity";
-            this.MidBoxCapacity.Size = new System.Drawing.Size(38, 23);
+            this.MidBoxCapacity.Size = new System.Drawing.Size(44, 23);
             this.MidBoxCapacity.TabIndex = 30;
+            this.MidBoxCapacity.Leave += new System.EventHandler(this.MidBoxCapacity_Leave);
             // 
             // MidLabelPrint
             // 
@@ -1498,7 +1564,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(9, 107);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(9, 106);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1548,7 +1614,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(113, 15);
+            this.LogingOut.Location = new System.Drawing.Point(113, 14);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -1585,7 +1651,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(7, 181);
+            this.label10.Location = new System.Drawing.Point(7, 179);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -1608,7 +1674,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(87, 213);
+            this.label9.Location = new System.Drawing.Point(87, 211);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(32, 17);
             this.label9.TabIndex = 88;
@@ -1631,7 +1697,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(7, 213);
+            this.label8.Location = new System.Drawing.Point(7, 211);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(32, 17);
             this.label8.TabIndex = 83;
@@ -1641,7 +1707,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(7, 150);
+            this.label6.Location = new System.Drawing.Point(7, 149);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -1662,13 +1728,14 @@
             this.OutboxCapacity.Location = new System.Drawing.Point(46, 147);
             this.OutboxCapacity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutboxCapacity.Name = "OutboxCapacity";
-            this.OutboxCapacity.Size = new System.Drawing.Size(30, 23);
+            this.OutboxCapacity.Size = new System.Drawing.Size(38, 23);
             this.OutboxCapacity.TabIndex = 84;
             this.OutboxCapacity.Value = new decimal(new int[] {
             1,
             0,
             0,
             0});
+            this.OutboxCapacity.Leave += new System.EventHandler(this.MidBoxCapacity_Leave);
             // 
             // OutBoxLabelPackage
             // 
@@ -1698,7 +1765,7 @@
             // 
             this.OutBoxLabelAutoPrint.AutoSize = true;
             this.OutBoxLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLabelAutoPrint.Location = new System.Drawing.Point(10, 111);
+            this.OutBoxLabelAutoPrint.Location = new System.Drawing.Point(10, 110);
             this.OutBoxLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxLabelAutoPrint.Name = "OutBoxLabelAutoPrint";
             this.OutBoxLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1718,28 +1785,6 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // AttachInfo
-            // 
-            this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AttachInfo.Location = new System.Drawing.Point(230, 141);
-            this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.AttachInfo.Name = "AttachInfo";
-            this.AttachInfo.Size = new System.Drawing.Size(88, 26);
-            this.AttachInfo.TabIndex = 85;
-            this.AttachInfo.Text = "附加信息设置";
-            this.AttachInfo.UseVisualStyleBackColor = true;
-            this.AttachInfo.Click += new System.EventHandler(this.AttachInfo_Click);
-            // 
-            // pi_date
-            // 
-            this.pi_date.AutoSize = true;
-            this.pi_date.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_date.Location = new System.Drawing.Point(5, 158);
-            this.pi_date.Name = "pi_date";
-            this.pi_date.Size = new System.Drawing.Size(0, 20);
-            this.pi_date.TabIndex = 86;
-            this.pi_date.Visible = false;
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1942,6 +1987,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn si_expression;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_item;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_expressionitem;
+        private System.Windows.Forms.Button AttachInfo;
+        private System.Windows.Forms.Label pi_date;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifpick;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
@@ -1951,6 +1998,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_vendprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_madein;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_zxbzs;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_lotno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_datecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_cusbarcode;
@@ -1959,12 +2008,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_barcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_custbarcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pib_custoutboxcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_pocode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodspec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
-        private System.Windows.Forms.Button AttachInfo;
-        private System.Windows.Forms.Label pi_date;
     }
 }

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -174,9 +174,9 @@ namespace UAS_LabelMachine
             sg_code.TableName = "scangroup";
             sg_code.DbChange += Sg_code_DbChange;
             pr_code.FormName = Name;
-            pr_code.SetValueField = new string[] { "pr_code", "pib_id" };
-            pr_code.TableName = "prodiodetail";
-            pr_code.SelectField = "pd_pdno # 行号,pd_prodcode # 物料编号";
+            pr_code.SetValueField = new string[] { "pr_code" };
+            pr_code.TableName = "prodiodetail left join product on pd_prodcode=pr_code";
+            pr_code.SelectField = "pd_pdno # 行号,pr_code # 物料编号";
 
             CollectionUnit.Text = "盘";
             Point pt = new Point();
@@ -192,6 +192,8 @@ namespace UAS_LabelMachine
             Left = 0;
             Width = ScreenArea.Width;
             Height = ScreenArea.Height;
+            MidBoxCapacity.Value = Properties.Settings.Default.MidBoxCapacity;
+            OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
             //怡海能达添加的特殊字段
             if (DataHelper.DBConnectionString.Contains("sz.hi-mantech.com") || DataHelper.DBConnectionString.Contains("192.168.1.200"))
             {
@@ -219,6 +221,8 @@ namespace UAS_LabelMachine
             {
                 MessageBox.Show("未安装CodeSoft软件或者版本不正确");
             }
+            RefreshDBConnect.Interval = 60000;
+            RefreshDBConnect.Start();
         }
 
         private void Sg_code_DbChange(object sender, EventArgs e)
@@ -628,8 +632,8 @@ namespace UAS_LabelMachine
             DataTable temp = (DataTable)dh.ExecuteSql("select pr_qtyperplace,pr_zxbzs from product where pr_code='" + pr_code + "'", "select");
             if (temp.Rows.Count > 0)
             {
-                try { OutboxCapacity.Value = (decimal)temp.Rows[0]["pr_qtyperplace"] / (decimal)temp.Rows[0]["pr_zxbzs"]; }
-                catch (Exception) { }
+                //try { OutboxCapacity.Value = (decimal)temp.Rows[0]["pr_qtyperplace"] / (decimal)temp.Rows[0]["pr_zxbzs"]; }
+                //catch (Exception) { }
             }
         }
 
@@ -1122,6 +1126,11 @@ namespace UAS_LabelMachine
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
+                    if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
+                    {
+                        string[] param = new string[] { PI_ID, "", "" };
+                        dh.CallProcedure("GetCustBarcode", param);
+                    }
                     LoadGridData(sender, e);
                     //重新输入单号后清除缓存
                     MidBoxArgument.Clear();
@@ -2023,8 +2032,8 @@ namespace UAS_LabelMachine
             else
             {
                 sql.Clear();
-                sql.Append("select pd_custprodcode,pd_custprodspec,pd_pocode,pib_madein,pib_custbarcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
-                sql.Append("pib_lotno,pib_datecode,pib_qty,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint");
+                sql.Append("select pd_custprodcode,pd_custprodspec,pd_pocode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,");
+                sql.Append("pib_lotno,pib_datecode,pib_qty,pr_spec,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint");
                 sql.Append(" from prodiobarcode left join prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and ");
                 sql.Append(" pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode left join sale on sa_code=pib_ordercode ");
                 sql.Append("where pib_piid='" + PI_ID + "' order by to_number(pib_outboxcode1),pib_id,pd_prodcode");
@@ -2312,14 +2321,14 @@ namespace UAS_LabelMachine
             }
             else
             {
-                int BoxCode = 0;
+                int BoxCode = 1;
                 for (int i = 0; i < LabelInf.Rows.Count; i++)
                 {
-                    if (i % OutboxCapacity.Value == 0)
+                    LabelInf.Rows[i].Cells["pib_outboxcode2"].Value = BoxCode;
+                    if (int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()) % OutboxCapacity.Value == 0)
                     {
                         BoxCode = BoxCode + 1;
                     }
-                    LabelInf.Rows[i].Cells["pib_outboxcode2"].Value = BoxCode;
                 }
             }
             SaveGrid_Click(sender, e);
@@ -2534,10 +2543,30 @@ namespace UAS_LabelMachine
             {
                 ExcelHandler eh = new ExcelHandler();
                 DataTable dt = ((DataTable)MidSource.DataSource).Copy();
-                for (int i = 0; i < dt.Columns.Count; i++)
+                for (int i = dt.Columns.Count - 1; i >= 0; i--)
                 {
                     for (int j = 0; j < LabelInf.Columns.Count; j++)
                     {
+                        //去除ID列
+                        if (dt.Columns[i].ColumnName.ToLower().Contains("id") || dt.Columns[i].ColumnName.ToLower() == "pib_barcode" || dt.Columns[i].ColumnName.ToLower() == "pib_pdno" || dt.Columns[i].ColumnName.ToLower() == "pib_ifpick" || dt.Columns[i].ColumnName.ToLower() == "pib_ifprint" || dt.Columns[i].ColumnName.ToLower() == "pib_datecode1" || dt.Columns[i].ColumnName.ToLower() == "pr_vendprodcode")
+                        {
+                            dt.Columns.RemoveAt(i);
+                            break;
+                        }
+                        switch (dt.Columns[i].ColumnName.ToLower())
+                        {
+                            case "pib_lotno":
+                                dt.Columns[i].ColumnName = "批次号";
+                                break;
+                            case "pib_datecode":
+                                dt.Columns[i].ColumnName = "生产日期";
+                                break;
+                            case "pib_custbarcode":
+                                dt.Columns[i].ColumnName = "最小产品包装条码";
+                                break;
+                            default:
+                                break;
+                        }
                         if (dt.Columns[i].ColumnName.ToLower() == LabelInf.Columns[j].DataPropertyName.ToLower())
                         {
                             dt.Columns[i].ColumnName = LabelInf.Columns[j].HeaderText;
@@ -2561,5 +2590,28 @@ namespace UAS_LabelMachine
             }
             else MessageBox.Show("请先获取出库单信息");
         }
+
+        private void MidBoxCapacity_Leave(object sender, EventArgs e)
+        {
+            NumericUpDown nup = (NumericUpDown)sender;
+            switch (nup.Name)
+            {
+                case "MidBoxCapacity":
+                    Properties.Settings.Default.MidBoxCapacity = nup.Value;
+                    Properties.Settings.Default.Save();
+                    break;
+                case "OutboxCapacity":
+                    Properties.Settings.Default.OutboxCapacity = nup.Value;
+                    Properties.Settings.Default.Save();
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void RefreshDBConnect_Tick(object sender, EventArgs e)
+        {
+            dh.ExecuteSql("select count(1) from employee", "select");
+        }
     }
 }

UAS-出货标签管理/UAS_出货标签管理.resx

@@ -153,6 +153,12 @@
   <metadata name="pib_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_zxbzs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_unit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pib_cusbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -165,12 +171,18 @@
   <metadata name="pib_custbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pib_custoutboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="pd_custprodspec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

UAS-出货标签管理/生成条码.cs

@@ -88,10 +88,10 @@ namespace UAS_LabelMachine
         private void GenerateBarCode_Click(object sender, EventArgs e)
         {
             //获取编码规则
-            DataTable Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_radix,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode='" + CustCode + "' order by nrd_detno", "select");
+            DataTable Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_radix,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode='" + CustCode + "' and nr_type='Single' order by nrd_detno", "select");
             //如果没有则取公共规则
             if (Nr.Rows.Count == 0)
-                Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_radix,nrd_type,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_isdefault <> 0 order by nrd_detno", "select");
+                Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_radix,nrd_type,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_type='Single' and nr_isdefault <> 0 order by nrd_detno", "select");
             //用于过滤参数的正则表达式
             Regex match = new Regex("{\\w+}");
             //用于存放每一项的明细的数据

UAS_DeviceMonitor/Main.Designer.cs

@@ -76,8 +76,20 @@ namespace UAS_DeviceMonitor
             this.dc_name = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_command = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageDeviceNetSetting = new DevExpress.XtraTab.XtraTabPage();
-            this.GridDeviceNetSetting = new DevExpress.XtraGrid.GridControl();
-            this.GridViewDeviceNetSetting = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.ButtonDeleteNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
+            this.ButtonAddNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
+            this.ButtonSaveNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonSaveGrid();
+            this.GridDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
+            this.GridViewDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
+            this.NetSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_getway = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_upperip = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_port = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_mac = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_ip = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dnc_type = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PagePollingSetting = new DevExpress.XtraTab.XtraTabPage();
             this.ButtonDeleteCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
             this.ButtonNewCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
@@ -121,11 +133,11 @@ namespace UAS_DeviceMonitor
             this.pl_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pl_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
-            this.GridDeviceStatus = new DevExpress.XtraGrid.GridControl();
-            this.GridViewDeviceStatus = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.GridDeviceStatus = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
+            this.GridViewDeviceStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             this.PageWorkCenterStatus = new DevExpress.XtraTab.XtraTabPage();
-            this.GridWorkCenterStatus = new DevExpress.XtraGrid.GridControl();
-            this.GridViewWorkCenterStatus = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.GridWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
+            this.GridViewWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -589,31 +601,158 @@ namespace UAS_DeviceMonitor
             // 
             // PageDeviceNetSetting
             // 
+            this.PageDeviceNetSetting.Controls.Add(this.ButtonDeleteNetConfig);
+            this.PageDeviceNetSetting.Controls.Add(this.ButtonAddNetConfig);
+            this.PageDeviceNetSetting.Controls.Add(this.ButtonSaveNetConfig);
             this.PageDeviceNetSetting.Controls.Add(this.GridDeviceNetSetting);
             this.PageDeviceNetSetting.Name = "PageDeviceNetSetting";
             this.PageDeviceNetSetting.PageVisible = false;
             this.PageDeviceNetSetting.Size = new System.Drawing.Size(1027, 577);
             // 
+            // ButtonDeleteNetConfig
+            // 
+            this.ButtonDeleteNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDeleteNetConfig.Grid = null;
+            this.ButtonDeleteNetConfig.Location = new System.Drawing.Point(813, 548);
+            this.ButtonDeleteNetConfig.Name = "ButtonDeleteNetConfig";
+            this.ButtonDeleteNetConfig.Size = new System.Drawing.Size(64, 23);
+            this.ButtonDeleteNetConfig.TabIndex = 12;
+            this.ButtonDeleteNetConfig.Text = "删除";
+            // 
+            // ButtonAddNetConfig
+            // 
+            this.ButtonAddNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonAddNetConfig.Grid = null;
+            this.ButtonAddNetConfig.Location = new System.Drawing.Point(883, 548);
+            this.ButtonAddNetConfig.Name = "ButtonAddNetConfig";
+            this.ButtonAddNetConfig.Size = new System.Drawing.Size(64, 23);
+            this.ButtonAddNetConfig.TabIndex = 11;
+            this.ButtonAddNetConfig.Text = "新增";
+            // 
+            // ButtonSaveNetConfig
+            // 
+            this.ButtonSaveNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonSaveNetConfig.Grid = null;
+            this.ButtonSaveNetConfig.HandlerOtherFirst = false;
+            this.ButtonSaveNetConfig.Location = new System.Drawing.Point(953, 548);
+            this.ButtonSaveNetConfig.Name = "ButtonSaveNetConfig";
+            this.ButtonSaveNetConfig.Size = new System.Drawing.Size(64, 23);
+            this.ButtonSaveNetConfig.TabIndex = 10;
+            this.ButtonSaveNetConfig.Text = "保存";
+            // 
             // GridDeviceNetSetting
             // 
             this.GridDeviceNetSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.GridDeviceNetSetting.Condition = null;
+            this.GridDeviceNetSetting.GetDataSQL = null;
+            this.GridDeviceNetSetting.ID = null;
+            this.GridDeviceNetSetting.InsertSQL = null;
             this.GridDeviceNetSetting.Location = new System.Drawing.Point(0, 2);
             this.GridDeviceNetSetting.MainView = this.GridViewDeviceNetSetting;
             this.GridDeviceNetSetting.MenuManager = this.RibbonNav;
             this.GridDeviceNetSetting.Name = "GridDeviceNetSetting";
-            this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 572);
+            this.GridDeviceNetSetting.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.dpc_enableCheckEdit});
+            this.GridDeviceNetSetting.RowCount = 0;
+            this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 540);
             this.GridDeviceNetSetting.TabIndex = 0;
+            this.GridDeviceNetSetting.TableName = null;
             this.GridDeviceNetSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.GridViewDeviceNetSetting});
             // 
             // GridViewDeviceNetSetting
             // 
+            this.GridViewDeviceNetSetting.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.NetSettingCheckedColumn,
+            this.dnc_id,
+            this.dnc_decode,
+            this.dnc_getway,
+            this.dnc_upperip,
+            this.dnc_port,
+            this.dnc_mac,
+            this.dnc_ip,
+            this.dnc_type});
             this.GridViewDeviceNetSetting.GridControl = this.GridDeviceNetSetting;
+            this.GridViewDeviceNetSetting.IndicatorWidth = 30;
             this.GridViewDeviceNetSetting.Name = "GridViewDeviceNetSetting";
             this.GridViewDeviceNetSetting.OptionsView.ShowGroupPanel = false;
             // 
+            // NetSettingCheckedColumn
+            // 
+            this.NetSettingCheckedColumn.Caption = " ";
+            this.NetSettingCheckedColumn.ColumnEdit = this.dpc_enableCheckEdit;
+            this.NetSettingCheckedColumn.FieldName = "CHECKEDCOLUMN";
+            this.NetSettingCheckedColumn.Name = "NetSettingCheckedColumn";
+            this.NetSettingCheckedColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.NetSettingCheckedColumn.OptionsFilter.AllowFilter = false;
+            this.NetSettingCheckedColumn.Tag = "0";
+            this.NetSettingCheckedColumn.Visible = true;
+            this.NetSettingCheckedColumn.VisibleIndex = 0;
+            // 
+            // dnc_id
+            // 
+            this.dnc_id.Caption = "ID";
+            this.dnc_id.FieldName = "DNC_ID";
+            this.dnc_id.Name = "dnc_id";
+            // 
+            // dnc_decode
+            // 
+            this.dnc_decode.Caption = "设备编号";
+            this.dnc_decode.FieldName = "DNC_DECODE";
+            this.dnc_decode.Name = "dnc_decode";
+            this.dnc_decode.Visible = true;
+            this.dnc_decode.VisibleIndex = 1;
+            // 
+            // dnc_getway
+            // 
+            this.dnc_getway.Caption = "网关";
+            this.dnc_getway.FieldName = "DNC_GATEWAY";
+            this.dnc_getway.Name = "dnc_getway";
+            this.dnc_getway.Visible = true;
+            this.dnc_getway.VisibleIndex = 2;
+            // 
+            // dnc_upperip
+            // 
+            this.dnc_upperip.Caption = "上级IP";
+            this.dnc_upperip.FieldName = "DNC_UPPERIP";
+            this.dnc_upperip.Name = "dnc_upperip";
+            this.dnc_upperip.Visible = true;
+            this.dnc_upperip.VisibleIndex = 3;
+            // 
+            // dnc_port
+            // 
+            this.dnc_port.Caption = "端口";
+            this.dnc_port.FieldName = "DNC_PORT";
+            this.dnc_port.Name = "dnc_port";
+            this.dnc_port.Visible = true;
+            this.dnc_port.VisibleIndex = 4;
+            // 
+            // dnc_mac
+            // 
+            this.dnc_mac.Caption = "MAC";
+            this.dnc_mac.FieldName = "DNC_MAC";
+            this.dnc_mac.Name = "dnc_mac";
+            this.dnc_mac.Visible = true;
+            this.dnc_mac.VisibleIndex = 5;
+            // 
+            // dnc_ip
+            // 
+            this.dnc_ip.Caption = "IP";
+            this.dnc_ip.FieldName = "DNC_IP";
+            this.dnc_ip.Name = "dnc_ip";
+            this.dnc_ip.Visible = true;
+            this.dnc_ip.VisibleIndex = 6;
+            // 
+            // dnc_type
+            // 
+            this.dnc_type.Caption = "类型";
+            this.dnc_type.FieldName = "DNC_TYPE";
+            this.dnc_type.Name = "dnc_type";
+            this.dnc_type.Visible = true;
+            this.dnc_type.VisibleIndex = 7;
+            // 
             // PagePollingSetting
             // 
             this.PagePollingSetting.Controls.Add(this.ButtonDeleteCommandSet);
@@ -742,8 +881,6 @@ namespace UAS_DeviceMonitor
             this.dpc_enableCheckEdit.AutoHeight = false;
             this.dpc_enableCheckEdit.Name = "dpc_enableCheckEdit";
             this.dpc_enableCheckEdit.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked;
-            this.dpc_enableCheckEdit.PictureChecked = ((System.Drawing.Image)(resources.GetObject("dpc_enableCheckEdit.PictureChecked")));
-            this.dpc_enableCheckEdit.PictureUnchecked = ((System.Drawing.Image)(resources.GetObject("dpc_enableCheckEdit.PictureUnchecked")));
             this.dpc_enableCheckEdit.ValueChecked = "-1";
             this.dpc_enableCheckEdit.ValueUnchecked = "0";
             // 
@@ -1069,18 +1206,25 @@ namespace UAS_DeviceMonitor
             this.GridDeviceStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.GridDeviceStatus.Condition = null;
+            this.GridDeviceStatus.GetDataSQL = null;
+            this.GridDeviceStatus.ID = null;
+            this.GridDeviceStatus.InsertSQL = null;
             this.GridDeviceStatus.Location = new System.Drawing.Point(3, 0);
             this.GridDeviceStatus.MainView = this.GridViewDeviceStatus;
             this.GridDeviceStatus.MenuManager = this.RibbonNav;
             this.GridDeviceStatus.Name = "GridDeviceStatus";
+            this.GridDeviceStatus.RowCount = 0;
             this.GridDeviceStatus.Size = new System.Drawing.Size(1024, 577);
             this.GridDeviceStatus.TabIndex = 0;
+            this.GridDeviceStatus.TableName = null;
             this.GridDeviceStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.GridViewDeviceStatus});
             // 
             // GridViewDeviceStatus
             // 
             this.GridViewDeviceStatus.GridControl = this.GridDeviceStatus;
+            this.GridViewDeviceStatus.IndicatorWidth = 30;
             this.GridViewDeviceStatus.Name = "GridViewDeviceStatus";
             this.GridViewDeviceStatus.OptionsView.ShowGroupPanel = false;
             // 
@@ -1097,18 +1241,25 @@ namespace UAS_DeviceMonitor
             this.GridWorkCenterStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.GridWorkCenterStatus.Condition = null;
+            this.GridWorkCenterStatus.GetDataSQL = null;
+            this.GridWorkCenterStatus.ID = null;
+            this.GridWorkCenterStatus.InsertSQL = null;
             this.GridWorkCenterStatus.Location = new System.Drawing.Point(0, 0);
             this.GridWorkCenterStatus.MainView = this.GridViewWorkCenterStatus;
             this.GridWorkCenterStatus.MenuManager = this.RibbonNav;
             this.GridWorkCenterStatus.Name = "GridWorkCenterStatus";
+            this.GridWorkCenterStatus.RowCount = 0;
             this.GridWorkCenterStatus.Size = new System.Drawing.Size(1024, 574);
             this.GridWorkCenterStatus.TabIndex = 0;
+            this.GridWorkCenterStatus.TableName = null;
             this.GridWorkCenterStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.GridViewWorkCenterStatus});
             // 
             // GridViewWorkCenterStatus
             // 
             this.GridViewWorkCenterStatus.GridControl = this.GridWorkCenterStatus;
+            this.GridViewWorkCenterStatus.IndicatorWidth = 30;
             this.GridViewWorkCenterStatus.Name = "GridViewWorkCenterStatus";
             this.GridViewWorkCenterStatus.OptionsView.ShowGroupPanel = false;
             // 
@@ -1249,13 +1400,25 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
         private DevExpress.XtraBars.BarButtonItem ButtonWorkCenterStatus;
-        private DevExpress.XtraGrid.GridControl GridDeviceNetSetting;
-        private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceNetSetting;
+        private AutoDataGridControl GridDeviceNetSetting;
+        private GridViewWithSerialNum GridViewDeviceNetSetting;
         private DevExpress.XtraTab.XtraTabPage PageDeviceStatus;
         private DevExpress.XtraTab.XtraTabPage PageWorkCenterStatus;
-        private DevExpress.XtraGrid.GridControl GridDeviceStatus;
-        private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceStatus;
-        private DevExpress.XtraGrid.GridControl GridWorkCenterStatus;
-        private DevExpress.XtraGrid.Views.Grid.GridView GridViewWorkCenterStatus;
+        private AutoDataGridControl GridDeviceStatus;
+        private GridViewWithSerialNum GridViewDeviceStatus;
+        private AutoDataGridControl GridWorkCenterStatus;
+        private GridViewWithSerialNum GridViewWorkCenterStatus;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_id;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_decode;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_getway;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_upperip;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_port;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_mac;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_ip;
+        private DevExpress.XtraGrid.Columns.GridColumn dnc_type;
+        private CustomerControl.Button.ButtonDeleteRow ButtonDeleteNetConfig;
+        private CustomerControl.Button.ButtonAddRow ButtonAddNetConfig;
+        private CustomerControl.Button.ButtonSaveGrid ButtonSaveNetConfig;
+        private DevExpress.XtraGrid.Columns.GridColumn NetSettingCheckedColumn;
     }
 }

UAS_DeviceMonitor/Main.cs

@@ -64,6 +64,15 @@ namespace UAS_DeviceMonitor
             ButtonSaveCommand.Grid = GridCommandSetting;
             ButtonDeleteCommand.Grid = GridCommandSetting;
 
+            //设备联网配置界面
+            GridDeviceNetSetting.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DNC_ID,DNC_DECODE,DNC_GATEWAY,DNC_UPPERIP,DNC_PORT,DNC_MAC,DNC_IP,DNC_TYPE FROM DEVICENETCONFIG order by DNC_ID";
+            GridDeviceNetSetting.ID = "dnc_id";
+            GridDeviceNetSetting.TableName = "DEVICENETCONFIG";
+            GridDeviceNetSetting.InsertSQL = "insert into DEVICENETCONFIG(DNC_ID,DNC_DECODE,DNC_GATEWAY,DNC_UPPERIP,DNC_PORT,DNC_MAC,DNC_IP,DNC_TYPE) values(DEVICENETCONFIG_SEQ.NEXTVAL,:DNC_DECODE,:DNC_GATEWAY,:DNC_UPPERIP,:DNC_PORT,:DNC_MAC,:DNC_IP,:DNC_TYPE)";
+            ButtonDeleteNetConfig.Grid = GridDeviceNetSetting;
+            ButtonAddNetConfig.Grid = GridDeviceNetSetting;
+            ButtonSaveNetConfig.Grid = GridDeviceNetSetting;
+
             Ptime = new Dictionary<int, PollingTimer>();
         }
         #endregion

UAS_DeviceMonitor/Main.resx

@@ -468,65 +468,6 @@
         MbrStgIBcdV77/Y96DMvlT3LotILiOAXkfQykuCmS2tytYePCSyCRRovUr0QZRM44BNa8kgRXQUFWUlU
         0IQK+NMk/6hy+EcSEeXwi1DBlwknwsrgE16G81QZ79C7EiGl8ApmlPCi8TmqgiAlPJnAEoGb3812yhZv
         Q/7XnP804u8k70qGzd6FP70Dfyb4dyh83/5/A3K8qVtfPX9uAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="dpc_enableCheckEdit.PictureChecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="dpc_enableCheckEdit.PictureUnchecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAENoZWNrQm94O5sXHjsAAAKwSURB
-        VDhPlZLZTxNRFIcrQXZQ/yXfjc++mKA+sIiJhhBlk0WWWASxLA2JC1QEQ0SDLSJQoC2VxVKCuAQXDAq1
-        7XTaTtuZTqfVn+feIkYTH2zy5dzM3N93zplUR79DRCZxmMj6D1iGZXWZvSMum/HhOoyj6+inyqFz34ib
-        oMrPxAM3euhZD9VbphUbZVlTXRa7qCW/Ez/2658kiGQyBTWhQdWSRArdJhcom80E2YbhNX4xnkhxFDUF
-        OZGErKZRVA1SJAYhEESYqhLX0DX4kglymCCH2TTqILMgEYsnObKi8cs7ewJq+hZQbXRi2rGBQEhCx50V
-        JshlgtzOe6t8NIV1p0BUVhFTEoSK95+9uNg5C8vaHqzbEs60TOOrx4f2AScT5DFBnv72Mt+Lhc2OLdT0
-        2vDY+hprm9s8PPdOwKPNIIpbZzA0vghfIIwW4+JvQfvAC9o9iSnnBzTeXYHZtYsmmursteeYeePHfbeA
-        csMiWvun4PXTd4iqaO5zMEE+E+S39DshU/eljR2U3ZjDsMuPeRp3dVfGoEtA1ZAbZVfHaHQvghEFUjSB
-        BoOdCQqYoKCx14EYfW0pqmB+eQunqXOXbRcGhwdtkx9xssKEV28/QQwr8IcUhEhQd3OBCQq5oL7bTh9O
-        gyipCEkypuybOFVvgd76BScujWHMsgRBlOALyhyRVqjpnD8QFNZ2LVB3jexxCNQlEIxgwurG8XMmVHc8
-        wZ5X4MFvIhEggRTHZb2VCYqYoOgK7R0ia7qDAoFqIBzjQa8vSOJ00BOIwSPE6J2CqutccIQLqvSzECMq
-        BNrPTwK2J4PJ0sjwigq8vMr8XmXbzMEEuaW147YLzZOoaHqGikYLzjf8wozyejPKiNK6pyghSusmUFI7
-        geLKUTtl+f8gY//Axjn6F8f+AXtHGV3GT+qTmOL/wFqMAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">