From 2d67aa96bf5e9e74c6033ced23b9ce38dc042637 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 06 十一月 2025 16:49:29 +0800
Subject: [PATCH] ID转姓名：返工列表、采购到货单（收料明细）、到货条码打印、采购入库单、其他入库申请、其他入库单
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 872ac86..0d37aea 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -87,7 +87,7 @@
request.ContentType = "application/json";
request.Headers.Add("token", GetBasicAuthTicket());
request.Accept = "*/*";
- request.Timeout = 150000;
+ // request.Timeout = 150000;
request.AllowAutoRedirect = false;
request.ServicePoint.Expect100Continue = false;
HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
@@ -267,6 +267,12 @@
{
gv.ClearSorting();
gv.OptionsCustomization.AllowSort = isEdt;
+
+ gv.OptionsFilter.AllowFilterEditor = isEdt;
+ gv.OptionsCustomization.AllowFilter = isEdt;
+ gv.OptionsView.ShowAutoFilterRow = isEdt;
+
+
foreach (GridColumn colmn in gv.Columns)
{
colmn.OptionsColumn.AllowEdit = true;
@@ -276,7 +282,8 @@
colmn.OptionsColumn.ReadOnly = false;
}
;
- if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
+ if (colmn.Name.ToString().Contains("gvMxDel")
+ || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
if (colmn.Visible == true)
@@ -307,6 +314,18 @@
if (_btnAry2.Length > 0)
{
var _btnType = _btnAry2[0];
+ _btnType.Enabled = !isEdt;
+ }
+ var _btnAry3 = controls.Find("btnCopyXls", false);
+ if (_btnAry3.Length > 0)
+ {
+ var _btnType = _btnAry3[0];
+ _btnType.Enabled = !isEdt;
+ }
+ var _btnAry4 = controls.Find("btnDown", false);
+ if (_btnAry4.Length > 0)
+ {
+ var _btnType = _btnAry4[0];
_btnType.Enabled = !isEdt;
}
foreach (JProperty property in dynamicObject.Properties())
@@ -565,6 +584,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾缁勭粐all
+ if (colType is UcLookOrgAll)
+ {
+ var txt = colType as UcLookOrgAll;
+ txt.SetIdOrCode(strVal);
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾鐢ㄦ埛
if (colType is UcLookUser)
{
@@ -683,6 +710,9 @@
{
gv.ClearSorting();
gv.OptionsCustomization.AllowSort = isEdt;
+ gv.OptionsFilter.AllowFilterEditor = isEdt;
+ gv.OptionsCustomization.AllowFilter = isEdt;
+ gv.OptionsView.ShowAutoFilterRow = isEdt;
foreach (GridColumn colmn in gv.Columns)
{
colmn.OptionsColumn.AllowEdit = true;
@@ -870,6 +900,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾缁勭粐All
+ if (ctrl is UcLookOrgAll)
+ {
+ var txt = ctrl as UcLookOrgAll;
+ txt.SetIdOrCode("-1");
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾鐢ㄦ埛
if (ctrl is UcLookUser)
{
@@ -971,6 +1009,12 @@
{
gv.ClearSorting();
gv.OptionsCustomization.AllowSort = isEdt;
+
+ gv.OptionsFilter.AllowFilterEditor = isEdt;
+ gv.OptionsCustomization.AllowFilter = isEdt;
+ gv.OptionsView.ShowAutoFilterRow = isEdt;
+
+
foreach (GridColumn colmn in gv.Columns)
{
colmn.OptionsColumn.AllowEdit = true;
@@ -1118,6 +1162,13 @@
if (ctrl is UcLookOrg)
{
var txt = ctrl as UcLookOrg;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾缁勭粐
+ if (ctrl is UcLookOrgAll)
+ {
+ var txt = ctrl as UcLookOrgAll;
txt.IsReadly = isEdt;
continue;
}
@@ -1787,8 +1838,10 @@
// column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
column.OptionsFilter.ImmediateUpdateAutoFilter = false;
- if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
+ if (column.Tag == null || column.Tag.ToString().EndsWith("edit") || column.Name== "colChkInt")
+ {
column.OptionsColumn.ReadOnly = false;
+ }
else
column.OptionsColumn.ReadOnly = true;
@@ -1868,14 +1921,16 @@
if (e.Column.FieldName.EndsWith("Color"))
{
int rowHandle = e.RowHandle;
- DataRow row = gridView1.GetDataRow(e.RowHandle);
- string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
- if (!string.IsNullOrEmpty(_bgColor))
- {
- Color bgColor = ColorTranslator.FromHtml(_bgColor);
- e.Appearance.BackColor = bgColor;
- // e.Appearance.BackColor2 = Color.LightSkyBlue;
- //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
+ if (rowHandle >= 0) {
+ DataRow row = gridView1.GetDataRow(e.RowHandle);
+ string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
+ if (!string.IsNullOrEmpty(_bgColor))
+ {
+ Color bgColor = ColorTranslator.FromHtml(_bgColor);
+ e.Appearance.BackColor = bgColor;
+ //e.Appearance.BackColor2 = Color.LightSkyBlue;
+ //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
+ }
}
}
}
@@ -2063,11 +2118,11 @@
column.MaxWidth = 0;
}
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
- gridView1.OptionsFilter.AllowFilterEditor = false;
+ gridView1.OptionsFilter.AllowFilterEditor = true;
gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
- gridView1.OptionsCustomization.AllowFilter = false;
+ gridView1.OptionsCustomization.AllowFilter = true;
gridView1.OptionsFind.ShowSearchNavButtons = false;
- gridView1.OptionsView.ShowAutoFilterRow = false;
+ gridView1.OptionsView.ShowAutoFilterRow = true;
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -2528,6 +2583,29 @@
return "";
}
}
+ public static string GetFirstOrg(UserControl.UcLookOrgAll txt_erpSczz)
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ string _extendText = _obj.rtnData.extendText;
+ string[] _dftOrg = _extendText.Split(',');
+ if (_dftOrg.Length > 0)
+ {
+ txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
+ return _dftOrg[0].Trim();
+ }
+ return "";
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
}
/// <summary>
--
Gitblit v1.9.3