From e97f3a0b90112386f96def011c6d4864d974594a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 14 二月 2025 10:26:08 +0800
Subject: [PATCH] 生产报工

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 25b4264..e0e6db0 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -190,11 +190,7 @@
                 string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
                     ? Guid.NewGuid().ToString()
                     : LoginInfoModel.CurrentUser.LoginUserGuid;
-            var orgGuid =
-                string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid)
-                    ? Guid.NewGuid().ToString()
-                    : LoginInfoModel.CurrentUser.LoginOrgGuid;
-            var token = userGuid + "~" + orgGuid;
+            var token = userGuid;
             return token;
         }
 
@@ -455,7 +451,6 @@
                             txt.Enabled = !isEdt;
                             continue;
                         }
-
                         //鏃堕棿
                         if (colType is DateTimePicker)
                         {
@@ -645,6 +640,7 @@
                                 txt.Enabled = false;
                             continue;
                         }
+                       
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -766,7 +762,6 @@
                         txt.ReadOnly = isEdt;
                     continue;
                 }
-
                 //鏃堕棿
                 if (ctrl is DateTimePicker)
                 {
@@ -793,7 +788,6 @@
                         txt.Checked = false;
                     continue;
                 }
-
                 //鑷畾涔変粨搴�
                 if (ctrl is UcLookCk)
                 {
@@ -914,6 +908,7 @@
                     txt.Enabled = !isEdt;
                     continue;
                 }
+             
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
@@ -1339,7 +1334,18 @@
             if (string.IsNullOrEmpty(str)) return Guid.Empty;
             return Guid.Parse(str);
         }
+        public static decimal ToDecimal(string str)
+        {
+            try
+            {
+                return decimal.Parse(str);
+            }
+            catch (Exception)
+            {
 
+                return 0;
+            }
+        }
         public static int ToInt(string str)
         {
             try
@@ -1377,12 +1383,7 @@
                 return true;
             return false;
         }
-        public string GetIsNullOrEmpty(string str)
-        {
-            if (string.IsNullOrEmpty(str.Trim()))
-                return "{>";
-            return str.Trim();
-        }
+       
 
         /// <summary>
         /// 璇诲彇grid鐨勫綋鍓嶈
@@ -1574,7 +1575,7 @@
                         var checkStatus = dgv.GetRowCellValue(selectedRow, fileName).ToString(); // 鑾峰彇鎸囧畾鍒楃殑鍊�
                         btnChkIco.Text = checkStatus;
                         btnChkIco.Visible = true;
-                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper())
+                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper()|| checkStatus == "宸插鏍�")
                         {
                             btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
                             btnChkIco.Tag = "宸插鏍�";
@@ -1700,9 +1701,11 @@
         /// <param name="action"></param>
         public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)
         {
+            gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             foreach (GridColumn column in gridView1.Columns)
             {
+                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
                 column.OptionsColumn.AllowEdit = true;
                 column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                 column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
@@ -1859,6 +1862,12 @@
         /// <param name="icoName"></param>
         public static void SetGridViewParameterMx(GridView gridView1)
         {
+           // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            foreach (GridColumn column in gridView1.Columns)
+            {
+                // column.DefaultCellStyle.Alignment = true;
+                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+            }
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             gridView1.OptionsFilter.AllowFilterEditor = false;
             gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;

--
Gitblit v1.9.3