From 7146f2ba84a317863dc662ca6f05e39c7972460f Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Wed, 6 Aug 2025 09:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E6=98=AF=E8=B4=A8=E6=A3=80=E6=8A=9B?=
 =?UTF-8?q?=E5=85=89=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PaintingPC/FrmQuality.cs | 31 +++++++++++++++++++++----------
 PaintingPC/Program.cs    |  3 ++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs
index b1fc92e..0f66583 100644
--- a/PaintingPC/FrmQuality.cs
+++ b/PaintingPC/FrmQuality.cs
@@ -389,7 +389,7 @@ namespace PaintingPC
             string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
             if (lastRst.Contains("报废"))
             {
-                MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}.");
+                MessageBox.Show($"条码已判定为报废，不能再判定为{GetType(currentRst)}.");
                 Clear();
                 return false;
             }
@@ -545,8 +545,8 @@ namespace PaintingPC
             }
             catch(Exception ex)
             {
-                ShowHint("执行其它判定发生异常,异常原因:" + ex.Message);
-                MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message);
+                ShowHint("执行抛光判定发生异常,异常原因:" + ex.Message);
+                MessageBox.Show("执行抛光判定发生异常,异常原因:" + ex.Message);
                 Clear();
             }
         }
@@ -605,7 +605,9 @@ namespace PaintingPC
             }
             #endregion
 
-            if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[{type}]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+           
+
+            if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[{GetType(type)}]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
             ShowHint("");
             #region 必须选择缺陷位置与缺陷原因，否则无法保存
             if (CheckDefect() == false) return;
@@ -622,8 +624,8 @@ namespace PaintingPC
                 int cs = Function.OtherTimes(txtBarCode.Text.Trim());
                 if (cs > 0)
                 {
-                    MessageBox.Show("条码" + txtBarCode.Text.Trim() + $"已存在判定为{type}的记录，只允许判定1次.");
-                    ShowHint("条码" + txtBarCode.Text.Trim() + $"已存在判定为{type}的记录，只允许判定1次.");
+                    MessageBox.Show("条码" + txtBarCode.Text.Trim() + $"已存在判定为{GetType(type)}的记录，只允许判定1次.");
+                    ShowHint("条码" + txtBarCode.Text.Trim() + $"已存在判定为{GetType(type)}的记录，只允许判定1次.");
                     Clear();
                     return;
                 }
@@ -638,6 +640,15 @@ namespace PaintingPC
             }
             SaveRst("其它", colorName, partName, 4);
         }
+        string GetType(string type)
+        {
+            string s = type;
+            if (type == "其它")
+            {
+                s = "抛光";
+            }
+            return s;
+        }
         /// <summary>
         /// 返喷按钮
         /// </summary>
@@ -901,9 +912,9 @@ namespace PaintingPC
                 {
                     DeleteRepectRst(id,"Web接口调用抛出异常,异常原因:" + ex.Message , bcode);
                 }
-                ShowHint(state+"-WMS报工异常,原因:" + ex.Message);
-                MessageBox.Show(state+"-WMS报工异常,原因:" + ex.Message);
-                LogHelper.WriteErrLogBase(state+"-WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+                ShowHint(GetType( state)+"-WMS报工异常,原因:" + ex.Message);
+                MessageBox.Show(GetType(state) + "-WMS报工异常,原因:" + ex.Message);
+                LogHelper.WriteErrLogBase(GetType(state) + "-WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
             }
         }
         private void DeleteRepectRst(string id,string msg,string oneBarCode)
@@ -1679,7 +1690,7 @@ namespace PaintingPC
                 }
                 else
                 {
-                    ShowHint("必须上次质量判定记录为点修补,类型为其它,才能在当前[点修补]工位扫码.", false);
+                    ShowHint("必须上次质量判定记录为点修补,类型为抛光,才能在当前[点修补]工位扫码.", false);
                     return false;
                 }
             }
diff --git a/PaintingPC/Program.cs b/PaintingPC/Program.cs
index b0fb89f..a88b256 100644
--- a/PaintingPC/Program.cs
+++ b/PaintingPC/Program.cs
@@ -37,7 +37,8 @@ namespace PaintingPC
 
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
             string pageView = ConfigurationManager.AppSettings["PageView"].ToString();
-            if(pageView == "喷涂质量看板")
+           
+            if (pageView == "喷涂质量看板")
             {
                 Application.Run(new FrmLogin()); 
             }