优化软件版本号

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -633,7 +633,6 @@
             // 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";

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.cs

@@ -87,6 +87,16 @@ namespace UAS_MES_NEW.Make
             StepCount.LineCode = User.UserLineCode;
             StepCount.Dh = dh;
             StepCount.Start();
+
+
+            if (User.CurrentStepName != "程序烧写")
+            {
+                new_softversion.Enabled = false;
+            }
+            else
+            {
+                new_softversion.Enabled = true;
+            }
         }
 
 
@@ -198,6 +208,15 @@ namespace UAS_MES_NEW.Make
                 ChoosedRejectList.Items.Clear();
                 WaitList.Clear();
                 ChoosedList.Clear();
+
+                if (User.CurrentStepName == "程序烧写" && string.IsNullOrEmpty(new_softversion.Text))
+                {
+                    OperateResult.AppendText(">>请输入软件版本号\n", Color.Red);
+                    new_softversion.Focus();
+                    new_softversion.SelectAll();
+                    return;
+                }
+
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
@@ -223,21 +242,10 @@ 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)
+
+                        if (User.CurrentStepName == "程序烧写")
                         {
-                            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;
-                            }
+                            dh.UpdateByCondition("makeserial", $"MS_SOFTVERSION='{new_softversion.Text.Trim()}'", "ms_sncode='" + ms_sncode.Text + "'");
                         }
 
                         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");
@@ -926,6 +934,12 @@ namespace UAS_MES_NEW.Make
                 BaseUtil.CleanControlsText(mcd_inqty, mcd_remainqty, ob_batchqty, ob_nowcheckqty, ob_sendqty);
                 LoadCollectedNum();
                 LoadCheckQTY();
+
+                dt = (DataTable)dh.ExecuteSql($"select ma_softversion from make where ma_code = '{ma_code.Text}'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    new_softversion.Text = dt.Rows[0]["ma_softversion"].ToString();
+                }
             }
         }
 
@@ -1204,17 +1218,24 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
+                if (string.IsNullOrEmpty(ma_code.Text))
+                {
+                    OperateResult.AppendText(">>更新软件版本，工单号不能为空\n", Color.Red);
+                    return;
+                }
                 string sv = new_softversion.Text.Trim();
+                new_softversion.Text = sv.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();
+                    dt = (DataTable)dh.ExecuteSql($"select * from makeserial where ms_makecode = '{ma_code.Text.Trim()}' and MS_SOFTVERSION is not null", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        dh.UpdateByCondition("makeserial", $"MS_SOFTVERSION='{sv}'", $"ms_makecode='{ma_code.Text.Trim()}' and MS_SOFTVERSION is not null");
+                    }
 
-                    new_softversion.Enabled = false;
+                    OperateResult.AppendText(">>软件版本号更新成功\n", Color.Green);
                     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
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B