| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Work/textSelect.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/Resources/statistical_16x16.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcDictionary.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcDictionary.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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:81/" />--> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" /> <add key="PageSize" value="50" /> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -45,6 +45,7 @@ this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemEdt = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemRoot = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -200,9 +201,10 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItemAdd, this.toolStripMenuItemEdt, this.toolStripMenuItemDel}); this.toolStripMenuItemDel, this.toolStripMenuItemRoot}); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(143, 82); this.contextMenuStrip1.Size = new System.Drawing.Size(143, 108); // // toolStripMenuItemAdd // @@ -224,6 +226,13 @@ this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; this.toolStripMenuItemDel.Size = new System.Drawing.Size(142, 26); this.toolStripMenuItemDel.Text = "鍒犻櫎璇ラ」"; // // toolStripMenuItemRoot // this.toolStripMenuItemRoot.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16; this.toolStripMenuItemRoot.Name = "toolStripMenuItemRoot"; this.toolStripMenuItemRoot.Size = new System.Drawing.Size(142, 26); this.toolStripMenuItemRoot.Text = "澧炲姞椤圭洰"; // // Frm_MesDefectCode // @@ -263,5 +272,6 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemEdt; private DevExpress.XtraTreeList.Columns.TreeListColumn tl8; private DevExpress.XtraTreeList.Columns.TreeListColumn tl9; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRoot; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -41,12 +41,23 @@ { strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString(); } Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, "澧炲姞鏂伴」", strUpGuid); Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, "澧炲姞瀛愰」", strUpGuid); frm.UpdateParent += (s2, ee2) => { getPageList(1); }; frm.ShowDialog(); }; this.toolStripMenuItemRoot.Click += (s, ee) => { string strGuid = ""; string strUpGuid = ""; Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, "澧炲姞椤圭洰", strUpGuid); frm.UpdateParent += (s2, ee2) => { getPageList(1); }; frm.ShowDialog(); }; this.toolStripMenuItemDel.Click += (s, ee) => { @@ -113,12 +124,18 @@ tlMenu.FocusedNode = node; if (node != null) { toolStripMenuItemAdd.Visible = true; toolStripMenuItemEdt.Visible = true; toolStripMenuItemDel.Visible = true; toolStripMenuItemRoot.Visible = false; tlMenu.ContextMenuStrip = contextMenuStrip1; } else { toolStripMenuItemAdd.Visible = false; toolStripMenuItemEdt.Visible = false; toolStripMenuItemDel.Visible = false; toolStripMenuItemRoot.Visible = true; tlMenu.ContextMenuStrip = contextMenuStrip1; tlMenu.FocusedNode = null; tlMenu.ClearSelection(); } } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx
@@ -117,4 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> </root> DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -1,4 +1,6 @@ 锘縩amespace Gs.DevApp.DevFrm.Work 锘縰sing Gs.DevApp.UserControl; namespace Gs.DevApp.DevFrm.Work { partial class Frm_Repair { @@ -65,9 +67,9 @@ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_badReson = new Gs.DevApp.DevFrm.Work.textSelect(); this.txt_remark = new Gs.DevApp.DevFrm.Work.textSelect(); this.txt_repairMethd = new Gs.DevApp.DevFrm.Work.textSelect(); this.txt_badReson = new UcDictionary(); this.txt_remark = new UcDictionary(); this.txt_repairMethd = new UcDictionary(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_gdbh = new DevExpress.XtraEditors.TextEdit(); this.txt_gx = new DevExpress.XtraEditors.TextEdit(); @@ -1564,10 +1566,10 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private textSelect txt_repairMethd; private UcDictionary txt_repairMethd; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private textSelect txt_badReson; private textSelect txt_remark; private UcDictionary txt_badReson; private UcDictionary txt_remark; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; DevApp/Gs.DevApp/DevFrm/Work/textSelect.resx
文件已删除 DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -755,12 +755,6 @@ <Compile Include="DevFrm\Work\SelectProcess.Designer.cs"> <DependentUpon>SelectProcess.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Work\textSelect.cs"> <SubType>UserControl</SubType> </Compile> <Compile Include="DevFrm\Work\textSelect.Designer.cs"> <DependentUpon>textSelect.cs</DependentUpon> </Compile> <Compile Include="DevFrm\WW\Frm_WwBlDj.cs"> <SubType>Form</SubType> </Compile> @@ -1009,6 +1003,12 @@ </Compile> <Compile Include="UserControl\UcComBox.Designer.cs"> <DependentUpon>UcComBox.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionary.cs"> <SubType>UserControl</SubType> </Compile> <Compile Include="UserControl\UcDictionary.Designer.cs"> <DependentUpon>UcDictionary.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcLookCk.cs"> <SubType>UserControl</SubType> @@ -1413,9 +1413,6 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\SelectProcess.resx"> <DependentUpon>SelectProcess.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\textSelect.resx"> <DependentUpon>textSelect.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WW\Frm_WwBlDj.resx"> <DependentUpon>Frm_WwBlDj.cs</DependentUpon> DevApp/Gs.DevApp/Resources/statistical_16x16.png
@@ -671,9 +671,9 @@ } //鑷畾涓嶈壇 if (colType is textSelect) if (colType is UcDictionary) { var txt = colType as textSelect; var txt = colType as UcDictionary; txt.TextTxt=(strVal); //if (txt.IsReadly == false) // txt.Enabled = !isEdt; DevApp/Gs.DevApp/UserControl/UcDictionary.Designer.cs
文件名从 DevApp/Gs.DevApp/DevFrm/Work/textSelect.Designer.cs 修改 @@ -1,6 +1,6 @@ 锘縩amespace Gs.DevApp.DevFrm.Work 锘縩amespace Gs.DevApp.UserControl { partial class textSelect partial class UcDictionary { /// <summary> /// Required designer variable. DevApp/Gs.DevApp/UserControl/UcDictionary.cs
文件名从 DevApp/Gs.DevApp/DevFrm/Work/textSelect.cs 修改 @@ -1,7 +1,5 @@ 锘縰sing DevExpress.XtraEditors; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; using Gs.DevApp.DevFrm.Work; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,11 +10,11 @@ using System.Threading.Tasks; using System.Windows.Forms; namespace Gs.DevApp.DevFrm.Work namespace Gs.DevApp.UserControl { public partial class textSelect : DevExpress.XtraEditors.XtraUserControl public partial class UcDictionary : DevExpress.XtraEditors.XtraUserControl { public textSelect() public UcDictionary() { InitializeComponent(); }
