From 430e096780219b81e19043829b637fcda4e61ca1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index ca6ecfd..95eca36 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -1,3 +1,4 @@
+using DevExpress.Utils;
 using Gs.DevApp.DevFrm.WW;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
@@ -7,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -28,6 +30,9 @@
             this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.getXmlConfig();
+            gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+            gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+            Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "pcShChk", "", (value) =>
             {
@@ -200,7 +205,7 @@
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
 
         }
@@ -214,7 +219,7 @@
             };
             if (string.IsNullOrEmpty(strGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             var _obj = new
@@ -252,11 +257,11 @@
                     }
                 }
                 else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -303,7 +308,7 @@
                 lbGuid, txt_daa001, gridView1, "daa001");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -319,9 +324,9 @@
                     _webServiceName + "EditModelSubmit",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
@@ -334,10 +339,12 @@
                         gridView1.FocusedRowHandle = rowHandle;
                     }
                 }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
     }

--
Gitblit v1.9.3