From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 82 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 32 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index bea6539..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)
{
@@ -785,10 +780,14 @@
{
var txt = ctrl as CheckEdit;
txt.ReadOnly = isEdt;
- txt.Checked = false;
+ if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren"))
+ {
+ txt.Checked = bool.Parse(txt.Tag.ToString().Replace("moren.", ""));
+ }
+ else
+ txt.Checked = false;
continue;
}
-
//鑷畾涔変粨搴�
if (ctrl is UcLookCk)
{
@@ -909,6 +908,7 @@
txt.Enabled = !isEdt;
continue;
}
+
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -1334,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
@@ -1372,12 +1383,7 @@
return true;
return false;
}
- public string GetIsNullOrEmpty(string str)
- {
- if (string.IsNullOrEmpty(str.Trim()))
- return "{>";
- return str.Trim();
- }
+
/// <summary>
/// 璇诲彇grid鐨勫綋鍓嶈
@@ -1569,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 = "宸插鏍�";
@@ -1597,23 +1603,29 @@
/// <param name="fm">褰撳墠绐椾綋</param>
/// <param name="fileName">1涓哄鏍革紝0涓哄弽瀹℃牳</param>
/// <param name="icoName"></param>
- public static void SetCheckIco(GridView gridView1,string zdChk,string zdChkUser,string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
+ public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
{
if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
btnChkIco.Tag = "宸插鏍�";
- gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
- gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
- gridView1.SetFocusedRowCellValue(zdChk, true);
+ if (!string.IsNullOrEmpty(zdChkUser))
+ gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
+ if (!string.IsNullOrEmpty(zdCkDate))
+ gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
+ if (!string.IsNullOrEmpty(zdChk))
+ gridView1.SetFocusedRowCellValue(zdChk, true);
}
else
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
btnChkIco.Tag = "鏈鏍�";
- gridView1.SetFocusedRowCellValue(zdChkUser, "");
- gridView1.SetFocusedRowCellValue(zdCkDate, "");
- gridView1.SetFocusedRowCellValue(zdChk, false);
+ if (!string.IsNullOrEmpty(zdChkUser))
+ gridView1.SetFocusedRowCellValue(zdChkUser, "");
+ if (!string.IsNullOrEmpty(zdCkDate))
+ gridView1.SetFocusedRowCellValue(zdCkDate, "");
+ if (!string.IsNullOrEmpty(zdChk))
+ gridView1.SetFocusedRowCellValue(zdChk, false);
}
btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
@@ -1689,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;
@@ -1717,10 +1731,6 @@
gridView1.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
- //if (e.RowHandle == GridControl.AutoFilterRowHandle)
- //{
- // e.Info.DisplayText = "绛涢�夎";
- //}
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
e.Info.DisplayText = (e.RowHandle + 1).ToString();
};
@@ -1763,8 +1773,10 @@
}
gridView1.RowStyle += (s, e) =>
{
- gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;//榛樿閫変腑琛屼笉鍙樿壊
- gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;//榛樿閫変腑鍗曞厓鏍间笉鍙樿壊
+ //榛樿閫変腑琛屼笉鍙樿壊
+ gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;
+ //榛樿閫変腑鍗曞厓鏍间笉鍙樿壊
+ gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
if (e.RowHandle >= 0)
{
DataRow row = gridView1.GetDataRow(e.RowHandle);
@@ -1776,14 +1788,14 @@
string _isRed = row["isRed"].ToString();
if (_isRed == "1")
{
- e.Appearance.BackColor = Color.LightPink;
+ e.Appearance.ForeColor = Color.Tomato;
}
}
// 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹�
if (gridView1.GetRow(e.RowHandle) == gridView1.GetFocusedRow())
{
- e.Appearance.BackColor = Color.LightSkyBlue;
- e.Appearance.BackColor2 = Color.Yellow;
+ e.Appearance.BackColor = Color.Azure;
+ e.Appearance.BackColor2 = Color.LightSkyBlue;
}
//else if (gridView1.IsRowHotTracked(e.RowHandle))
//{
@@ -1850,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