From 93bd757f4801719b769e78f4dee00847c228a55d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 11 六月 2025 14:06:59 +0800
Subject: [PATCH] iqc单元格
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 +++++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 58 ++++++++++++++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 38 ++++++++-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 50 ++++++++++--
DevApp/Gs.DevApp/Gs.DevApp.csproj | 14 ++-
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/Properties/Resources.resx | 48 ++++++-----
DevApp/Gs.DevApp/DevFrm/FrmMain.resx | 3
9 files changed, 195 insertions(+), 44 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index f130d2b..3d80851 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index a25003b..f25b50a 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -43,6 +43,8 @@
this.barPwd = new DevExpress.XtraBars.BarButtonItem();
this.barMsg = new DevExpress.XtraBars.BarListItem();
this.barMsgXf = new DevExpress.XtraBars.BarButtonItem();
+ this.barOrg = new DevExpress.XtraBars.BarEditItem();
+ this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
this.fdm1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -52,6 +54,7 @@
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
this.strp1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fdm1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
this.cms1.SuspendLayout();
@@ -119,16 +122,20 @@
this.barExit,
this.barPwd,
this.barMsg,
- this.barMsgXf});
+ this.barMsgXf,
+ this.barOrg});
this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
this.fluentDesignFormControl1.Manager = this.fdm1;
this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
+ this.fluentDesignFormControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemCheckedComboBoxEdit1});
this.fluentDesignFormControl1.Size = new System.Drawing.Size(1230, 39);
this.fluentDesignFormControl1.TabIndex = 2;
this.fluentDesignFormControl1.TabStop = false;
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMy);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsgXf);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsg);
+ this.fluentDesignFormControl1.TitleItemLinks.Add(this.barOrg);
//
// barMy
//
@@ -173,6 +180,24 @@
this.barMsgXf.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barMsgXf.ImageOptions.LargeImage")));
this.barMsgXf.Name = "barMsgXf";
//
+ // barOrg
+ //
+ this.barOrg.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
+ this.barOrg.Caption = "鍒囨崲缁勭粐";
+ this.barOrg.Edit = this.repositoryItemCheckedComboBoxEdit1;
+ this.barOrg.EditWidth = 150;
+ this.barOrg.Id = 37;
+ this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.usergroup_16x161;
+ this.barOrg.Name = "barOrg";
+ this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ //
+ // repositoryItemCheckedComboBoxEdit1
+ //
+ this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false;
+ this.repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1";
+ //
// fdm1
//
this.fdm1.Form = this;
@@ -181,8 +206,11 @@
this.barExit,
this.barPwd,
this.barMsg,
- this.barMsgXf});
- this.fdm1.MaxItemId = 37;
+ this.barMsgXf,
+ this.barOrg});
+ this.fdm1.MaxItemId = 38;
+ this.fdm1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemCheckedComboBoxEdit1});
//
// acrd
//
@@ -244,6 +272,7 @@
this.strp1.ResumeLayout(false);
this.strp1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fdm1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
this.cms1.ResumeLayout(false);
@@ -269,6 +298,7 @@
private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent;
private System.Windows.Forms.ToolStripMenuItem tabCloseAll;
private System.Windows.Forms.ToolStripStatusLabel toolZhiChi;
-
+ private DevExpress.XtraBars.BarEditItem barOrg;
+ private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c16e184..c3aa09e 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -25,7 +25,7 @@
/// tab涓存椂閫夐」鍗�
/// </summary>
private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -59,6 +59,40 @@
catch (Exception)
{
}
+ }
+ };
+ GetOrg();
+ barOrg.EditValueChanged += (s, e) =>
+ {
+ if (barOrg.EditValue == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ string _val = barOrg.EditValue.ToString();
+ if (string.IsNullOrEmpty(_val))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ if (OldorgFids == _val)
+ return;
+ var _obj = new
+ {
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userOrgFids = _val,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
}
@@ -448,5 +482,27 @@
}
#endregion
+ private void GetOrg()
+ {
+ 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 _rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = _rtn.rtnData.list;
+ repositoryItemCheckedComboBoxEdit1.DataSource = dt;
+ repositoryItemCheckedComboBoxEdit1.DisplayMember = "name";
+ repositoryItemCheckedComboBoxEdit1.ValueMember = "fid";
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ barOrg.EditValue = _obj.rtnData.extendText;
+ OldorgFids = _obj.rtnData.extendText;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
index 9206552..cb29cb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
@@ -120,6 +120,9 @@
<metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>284, 17</value>
</metadata>
+ <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>284, 17</value>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index f7499da..8148aeb 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -13,7 +13,7 @@
string _webServiceName = "MesQaItemsDetect01Manager/";
private string dt01Guid = "";
bool isEdit = false;
-
+ string strBhg = "脳";
/// <summary>
///
/// </summary>
@@ -25,10 +25,13 @@
this.dt01Guid = _dt01Guid;
this.isEdit = _blEdit;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- getModel();
+ //缂栬緫浜嬩欢
gvMx1.CellValueChanged += GvMx1_CellValueChanged;
- gvMx1.ShowingEditor += GvMx1_ShowingEditor;
+ //鍙栨秷涓嶇鍚堟潯浠剁殑缂栬緫
+ // gvMx1.ShowingEditor += GvMx1_ShowingEditor;
+ //绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍间笖鏀瑰彉棰滆壊
gvMx1.CustomDrawCell += GvMx1_CustomDrawCell;
+ getModel();
}
/// <summary>
@@ -44,6 +47,10 @@
return false;
if (_FieldName == "鏍锋湰鏁�")
return true;
+
+ if (_FieldName.Contains("jg"))
+ return false;
+
if (string.IsNullOrEmpty(_maxYbs))
return false;
string _seqYb = _FieldName.Replace("鏍锋湰", "");
@@ -52,8 +59,14 @@
return true;
}
+ /// <summary>
+ /// 绂佺敤鏍锋湰鏁颁箣澶栫殑鍗曞厓鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void GvMx1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
{
+ // 鑾峰彇鍗曞厓鏍肩殑鍊�
string _maxYbs = (gvMx1.GetRowCellValue(e.RowHandle, "鏍锋湰鏁�").ToString());
bool _bl = ckCol(e.Column.FieldName, _maxYbs);
if (_bl)
@@ -65,12 +78,22 @@
{
e.Appearance.BackColor = Color.LightGray;
}
-
e.Column.OptionsColumn.ReadOnly = !isEdit;
+ if (e.Column.Name.Contains("鏍锋湰") && e.Column.Name != "鏍锋湰鏁�")
+ {
+ object value = gvMx1.GetRowCellValue(e.RowHandle, e.Column + "jg");
+ if (value != null && value.ToString() == strBhg)
+ {
+ e.Appearance.ForeColor = Color.White;
+ e.Appearance.BackColor = Color.Red;
+ };
+ }
}
private void GvMx1_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
+ if (e.Column.FieldName.Contains("jg"))
+ return;
try
{
// 鑾峰彇琛屽彞鏌�
@@ -110,11 +133,15 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError(_outMsg);
gvMx1.SetRowCellValue(rowHandle, dtCol, "");
}
+ else
+ {
+ //濡傛灉涓嶅悎鏍硷紝瀛樿繘鍘�
+ string _outFstand = _rtn.rtnData.outFstand;
+ gvMx1.SetRowCellValue(rowHandle, dtCol + "jg", _outFstand);
+ }
+ //濡傛灉鏄牱鏈暟锛岃閲嶆柊鍒锋柊
if (_strYbNo == "鏍锋湰鏁�")
getModel();
- //lbGuid.Text = _rtn.rtnData.outGuid;
- //txt_hNo.Text = _rtn.rtnData.outNo;
- //toolBarMenu1.isSetBtn = true;
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -132,7 +159,6 @@
bool _bl = ckCol(view.FocusedColumn.FieldName, _maxYbs);
if (!_bl)
e.Cancel = true;
-
}
private void getModel()
@@ -156,6 +182,14 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ // 闅愯棌涓嶅繀瑕佺殑鍒�,鍚屾椂鎶婁笉鍚堟牸鐨勫瓨杩涘幓
+ foreach (DataColumn col in dt.Columns)
+ {
+ if (col.ColumnName.Contains("jg"))
+ {
+ gvMx1.Columns[col.ColumnName].Visible = false;
+ }
+ }
gvMx1.Columns["guid"].Visible = false;
gvMx1.Columns["parentGuid"].Visible = false;
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ed0229c..6ea4d93 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -347,6 +347,12 @@
<Compile Include="DevFrm\FQC\UcChouJianList.Designer.cs">
<DependentUpon>UcChouJianList.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\FrmMain.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FrmMain.Designer.cs">
+ <DependentUpon>FrmMain.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs">
<SubType>Form</SubType>
</Compile>
@@ -674,12 +680,6 @@
</Compile>
<Compile Include="DevFrm\FrmLogin.Designer.cs">
<DependentUpon>FrmLogin.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\FrmMain.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\FrmMain.Designer.cs">
- <DependentUpon>FrmMain.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sys\DocNoRule.cs">
<SubType>Form</SubType>
@@ -2058,6 +2058,8 @@
<None Include="Resources\copy_16x16.png" />
<None Include="Resources\exporttoxls_16x16.png" />
<None Include="Resources\historyitem_16x16.png" />
+ <None Include="Resources\usergroup_16x16.png" />
+ <None Include="Resources\usergroup_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 7d3b684..78abfc4 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -2673,6 +2673,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap usergroup_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("usergroup_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap usergroup_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("usergroup_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap usergroup_32x32 {
get {
object obj = ResourceManager.GetObject("usergroup_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index ff41707..71e506c 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -300,10 +300,8 @@
<data name="printarea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printarea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\historyitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -320,9 +318,6 @@
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -413,6 +408,11 @@
</data>
<data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -571,6 +571,9 @@
<data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="usergroup_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\usergroup_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -586,6 +589,11 @@
</data>
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -733,6 +741,9 @@
<data name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="usergroup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\usergroup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -740,9 +751,6 @@
</data>
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
- </data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -895,10 +903,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -915,6 +921,11 @@
</data>
<data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -1104,10 +1115,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
@@ -1121,8 +1130,5 @@
<value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\historyitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 873cffb..57536c9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -333,7 +333,7 @@
//
// btnJianYan
//
- this.btnJianYan.Caption = "鎻愪氦妫�楠�";
+ this.btnJianYan.Caption = "QC瀹℃牳";
this.btnJianYan.Id = 27;
this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
@@ -343,7 +343,7 @@
//
// btnFjianYan
//
- this.btnFjianYan.Caption = "鎾ゅ洖妫�楠�";
+ this.btnFjianYan.Caption = "QC鍙嶅鏍�";
this.btnFjianYan.Id = 28;
this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
--
Gitblit v1.9.3