Revert "测采添加版本号"

This reverts commit f45c237ae539a5cf8c3344baa5fd7c93c3b11621.

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -81,7 +81,6 @@
             this.mc_restqty_label = new System.Windows.Forms.Label();
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
-            this.new_softversion = new System.Windows.Forms.TextBox();
             this.ob_sendqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ob_batchqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ob_nowcheckqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
@@ -210,7 +209,6 @@
             this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WaitRejectList.FullRowSelect = true;
-            this.WaitRejectList.HideSelection = false;
             this.WaitRejectList.Location = new System.Drawing.Point(6, 423);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
@@ -292,7 +290,6 @@
             this.columnHeader8,
             this.columnHeader10});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChoosedRejectList.HideSelection = false;
             this.ChoosedRejectList.Location = new System.Drawing.Point(552, 423);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
@@ -630,17 +627,6 @@
             this.ob_checkno.Tag = "ob_checkno";
             this.ob_checkno.Visible = false;
             // 
-            // new_softversion
-            // 
-            this.new_softversion.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.new_softversion.Enabled = false;
-            this.new_softversion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.new_softversion.Location = new System.Drawing.Point(124, 169);
-            this.new_softversion.Name = "new_softversion";
-            this.new_softversion.Size = new System.Drawing.Size(237, 31);
-            this.new_softversion.TabIndex = 243;
-            this.new_softversion.KeyDown += new System.Windows.Forms.KeyEventHandler(this.new_softversion_KeyDown);
-            // 
             // ob_sendqty
             // 
             this.ob_sendqty.AutoSize = true;
@@ -812,7 +798,6 @@
             this.ma_softversion.Name = "ma_softversion";
             this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 73;
-            this.ma_softversion.Visible = false;
             // 
             // Save
             // 
@@ -1022,7 +1007,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1291, 788);
-            this.Controls.Add(this.new_softversion);
             this.Controls.Add(this.ob_checkno);
             this.Controls.Add(this.ob_sendqty);
             this.Controls.Add(this.label12);
@@ -1184,6 +1168,5 @@
         private CustomControl.ValueLabel.ValueLabel mcd_inqty;
         private System.Windows.Forms.Label mcd_inqty_label;
         private System.Windows.Forms.Label ob_checkno;
-        private System.Windows.Forms.TextBox new_softversion;
     }
 }

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.cs

@@ -223,23 +223,6 @@ namespace UAS_MES_NEW.Make
                                 LockMakeCode.Checked = true;
                             }
                         }
-                        string wo = string.IsNullOrEmpty(oMakeCode) ? ma_code.Text.Trim() : oMakeCode;
-                        dt = (DataTable)dh.ExecuteSql($"select ma_softversion from make where ma_code = '{wo}'", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            string softversion = dt.Rows[0]["ma_softversion"].ToString();
-                            if (string.IsNullOrEmpty(softversion) && User.CurrentStepName == "程序烧写")
-                            {
-                                new_softversion.Enabled = true;
-                                new_softversion.Focus();
-                            }
-                            else
-                            {
-                                new_softversion.Enabled = false;
-                                new_softversion.Text = softversion;
-                            }
-                        }
-
                         dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
                         string status = dt.Rows[0]["ms_status"].ToString();
                         reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
@@ -1199,26 +1182,5 @@ namespace UAS_MES_NEW.Make
 
             }
         }
-
-        private void new_softversion_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                string sv = new_softversion.Text.Trim();
-                if (!string.IsNullOrEmpty(sv))
-                {
-                    dh.UpdateByCondition("make", $"ma_softversion='{sv}'", "ma_code='" + ma_code.Text.Trim() + "'");
-                    dh.UpdateByCondition("makeserial", $"MS_SOFTVERSION='{sv}'", "ms_id='" + oMSID + "'");
-
-                    new_softversion.Text = "";
-                    dt = (DataTable)dh.ExecuteSql($"SELECT ms_softversion FROM makeserial WHERE ms_id = '{oMSID}'", "select");
-                    new_softversion.Text = dt.Rows[0]["ms_softversion"].ToString();
-
-                    new_softversion.Enabled = false;
-                    ms_sncode.Focus();
-                    ms_sncode.SelectAll();
-                }
-            }
-        }
     }
 }

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.resx

@@ -262,7 +262,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS_MES_XZC/DataOperate/DataHelper.cs

@@ -10,7 +10,7 @@ namespace UAS_MES_NEW.DataOperate
     class DataHelper
     {
         //系统默认的的连接字符串 
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11704)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.110.18)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //public static readonly string ERPAddesss = "http://192.168.110.18:8099/mes/";
 

UAS_MES_XZC/Login.cs

@@ -47,7 +47,7 @@ namespace UAS_MES_NEW
         {
             BaseUtil.FormStepInOrOut(this, true);
             //设置默认数据库
-            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11704)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.110.18)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.ProcessesID = System.Diagnostics.Process.GetCurrentProcess().Id;
             CheckForIllegalCrossThreadCalls = false;
             LoadMasterInf = new Thread(LoadMaster);
@@ -94,7 +94,7 @@ namespace UAS_MES_NEW
             //设置选中数据库的链接
             string DBUser = DB.SelectedValue.ToString().Split('#')[0];
             string Address = DB.SelectedValue.ToString().Split('#')[1];
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11704)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.110.18)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;
             //设置屏幕的宽高信息
             SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;

UAS_MES_XZC/UAS_MES_XZC.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36202.13 d17.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_XZC", "UAS_MES_XZC.csproj", "{53E3A804-52BA-4E22-BBF0-172A96938DD4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AF3A71C7-0F6D-4654-9789-6E0BF89B9814}
-	EndGlobalSection
-EndGlobal