From 565fe285c40fb5451a27dc594612561f4e66b1cb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 28 十月 2024 08:11:48 +0800
Subject: [PATCH] 进度条
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 15
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 236 +++----
DevApp/Gs.DevApp/UserControl/UcLoading.resx | 120 ++++
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs | 20
DevApp/Gs.DevApp/Gs.DevApp.csproj | 20
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 547 +++++++------------
DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs | 5
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 84 --
DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 59 ++
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 131 ++++
DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs | 150 +++++
DevApp/Gs.DevApp/UserControl/UcLoading.cs | 71 ++
DevApp/Gs.DevApp/Properties/Resources.resx | 76 +-
DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs | 94 ++-
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 15
17 files changed, 1,000 insertions(+), 649 deletions(-)
diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index ecf934d..989bbc3 100644
--- a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
+++ b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"TestForm\\XtraForm1.cs"},{"SourceFile":"TestForm\\XtraForm1.Designer.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLoading.cs"},{"SourceFile":"UserControl\\UcLoading.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowDialogForm.cs"},{"SourceFile":"UserControl\\ShowDialogForm.designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\XtraUserControl1.cs"},{"SourceFile":"UserControl\\XtraUserControl1.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 7c67fdc..7ee739a 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -5,6 +5,7 @@
using System.Data;
using System.Drawing;
using System.Reflection;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
@@ -102,16 +103,12 @@
/// <param name="e"></param>
private void TooLoading_Click(object sender, EventArgs e)
{
- var i = 100;
- var sdf = new ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝ｅ湪鎿嶄綔涓紒");
- for (var j = 0; j < i; j++)
- sdf.SetCaption("鎵ц杩涘害锛�" + j + "/" + i + "锛�");
- sdf.Close();
getTree();
}
- private void getTree()
+ private async void getTree()
{
+ UcLoading _loading = new UcLoading();
toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
@@ -120,10 +117,11 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("",
+ var strJson = await UtilityHelper.HttpPostAsync("",
"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
var _job = JObject.Parse(strJson);
var rtnCode = _job["rtnCode"].ToString();
+
if (int.Parse(rtnCode) > 0)
{
acrd.Clear();
@@ -175,10 +173,8 @@
AddTabpage(tab, tabPageName, tabText,
newFormName, imgIcon);
}
-
idx++;
}
-
;
gdx++;
}
@@ -192,6 +188,7 @@
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index 19b7d0c..bda4328 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,7 +50,6 @@
this.gvMx1checkRes = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1subQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -66,15 +65,12 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gv_thstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
- this.txt_fType = new DevExpress.XtraEditors.TextEdit();
this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
- this.txt_urgentFlag = new DevExpress.XtraEditors.TextEdit();
this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_insby = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
this.gv_ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_sapstatus = new DevExpress.XtraEditors.LabelControl();
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -104,7 +100,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
- this.txt_sapstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
@@ -114,12 +109,13 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -133,8 +129,9 @@
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_sapstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1states
@@ -148,7 +145,7 @@
this.gvMx1states.OptionsColumn.ReadOnly = true;
this.gvMx1states.Tag = "query_a.states";
this.gvMx1states.Visible = true;
- this.gvMx1states.VisibleIndex = 22;
+ this.gvMx1states.VisibleIndex = 24;
this.gvMx1states.Width = 100;
//
// gvMx1returnFlag
@@ -162,7 +159,7 @@
this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.Visible = true;
- this.gvMx1returnFlag.VisibleIndex = 21;
+ this.gvMx1returnFlag.VisibleIndex = 23;
this.gvMx1returnFlag.Width = 100;
//
// gvMx1cgRkqty
@@ -176,7 +173,7 @@
this.gvMx1cgRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1cgRkqty.Tag = "query_a.cg_rkqty";
this.gvMx1cgRkqty.Visible = true;
- this.gvMx1cgRkqty.VisibleIndex = 20;
+ this.gvMx1cgRkqty.VisibleIndex = 22;
this.gvMx1cgRkqty.Width = 100;
//
// gvMx1okRkqty
@@ -190,7 +187,7 @@
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 9;
+ this.gvMx1okRkqty.VisibleIndex = 12;
this.gvMx1okRkqty.Width = 100;
//
// gvMx1dha001
@@ -204,7 +201,7 @@
this.gvMx1dha001.OptionsColumn.ReadOnly = true;
this.gvMx1dha001.Tag = "query_a.dha001";
this.gvMx1dha001.Visible = true;
- this.gvMx1dha001.VisibleIndex = 19;
+ this.gvMx1dha001.VisibleIndex = 21;
this.gvMx1dha001.Width = 100;
//
// gvMx1isdepsIn
@@ -218,7 +215,7 @@
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.Visible = true;
- this.gvMx1isdepsIn.VisibleIndex = 18;
+ this.gvMx1isdepsIn.VisibleIndex = 20;
this.gvMx1isdepsIn.Width = 100;
//
// gvMx1fType
@@ -232,7 +229,7 @@
this.gvMx1fType.OptionsColumn.ReadOnly = true;
this.gvMx1fType.Tag = "query_a.f_type";
this.gvMx1fType.Visible = true;
- this.gvMx1fType.VisibleIndex = 17;
+ this.gvMx1fType.VisibleIndex = 19;
this.gvMx1fType.Width = 100;
//
// gvMx1workLine
@@ -246,7 +243,7 @@
this.gvMx1workLine.OptionsColumn.ReadOnly = true;
this.gvMx1workLine.Tag = "query_a.work_line";
this.gvMx1workLine.Visible = true;
- this.gvMx1workLine.VisibleIndex = 16;
+ this.gvMx1workLine.VisibleIndex = 18;
this.gvMx1workLine.Width = 100;
//
// gvMx1boardStyle
@@ -260,7 +257,7 @@
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 4;
+ this.gvMx1boardStyle.VisibleIndex = 7;
this.gvMx1boardStyle.Width = 100;
//
// gvMx1okQty
@@ -274,7 +271,7 @@
this.gvMx1okQty.OptionsColumn.ReadOnly = true;
this.gvMx1okQty.Tag = "query_a.ok_qty";
this.gvMx1okQty.Visible = true;
- this.gvMx1okQty.VisibleIndex = 8;
+ this.gvMx1okQty.VisibleIndex = 11;
this.gvMx1okQty.Width = 100;
//
// gvMx1ischeck
@@ -288,7 +285,7 @@
this.gvMx1ischeck.OptionsColumn.ReadOnly = true;
this.gvMx1ischeck.Tag = "query_a.ischeck";
this.gvMx1ischeck.Visible = true;
- this.gvMx1ischeck.VisibleIndex = 12;
+ this.gvMx1ischeck.VisibleIndex = 14;
this.gvMx1ischeck.Width = 100;
//
// gvMx1checkDate
@@ -302,7 +299,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 15;
+ this.gvMx1checkDate.VisibleIndex = 17;
this.gvMx1checkDate.Width = 100;
//
// gvMx1checkStates
@@ -316,7 +313,7 @@
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
- this.gvMx1checkStates.VisibleIndex = 14;
+ this.gvMx1checkStates.VisibleIndex = 16;
this.gvMx1checkStates.Width = 100;
//
// gvMx1checkRes
@@ -330,7 +327,7 @@
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
- this.gvMx1checkRes.VisibleIndex = 13;
+ this.gvMx1checkRes.VisibleIndex = 15;
this.gvMx1checkRes.Width = 100;
//
// gvMx1memo
@@ -343,7 +340,7 @@
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "query_a.memo";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 11;
+ this.gvMx1memo.VisibleIndex = 13;
this.gvMx1memo.Width = 100;
//
// gvMx1urgentFlag
@@ -358,20 +355,6 @@
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
this.gvMx1urgentFlag.Width = 100;
//
- // gvMx1workNo
- //
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1workNo.Caption = "浠诲姟鍗曞彿 ";
- this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 100;
- this.gvMx1workNo.Name = "gvMx1workNo";
- this.gvMx1workNo.OptionsColumn.ReadOnly = true;
- this.gvMx1workNo.Tag = "query_a.work_no";
- this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 10;
- this.gvMx1workNo.Width = 100;
- //
// gvMx1subQty
//
this.gvMx1subQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -383,7 +366,7 @@
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 7;
+ this.gvMx1subQty.VisibleIndex = 10;
this.gvMx1subQty.Width = 100;
//
// gvMx1quantity
@@ -400,7 +383,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 6;
+ this.gvMx1quantity.VisibleIndex = 9;
this.gvMx1quantity.Width = 100;
//
// gvMx1itemNo
@@ -414,7 +397,7 @@
this.gvMx1itemNo.OptionsColumn.ReadOnly = true;
this.gvMx1itemNo.Tag = "query_a.item_no";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 3;
+ this.gvMx1itemNo.VisibleIndex = 6;
this.gvMx1itemNo.Width = 100;
//
// gvMx1ebelnQty
@@ -428,7 +411,7 @@
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 5;
+ this.gvMx1ebelnQty.VisibleIndex = 8;
this.gvMx1ebelnQty.Width = 100;
//
// gvMx1ebelnLine
@@ -442,7 +425,7 @@
this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
this.gvMx1ebelnLine.Visible = true;
- this.gvMx1ebelnLine.VisibleIndex = 2;
+ this.gvMx1ebelnLine.VisibleIndex = 5;
this.gvMx1ebelnLine.Width = 100;
//
// gvMx1ebeln
@@ -456,7 +439,7 @@
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 1;
+ this.gvMx1ebeln.VisibleIndex = 4;
this.gvMx1ebeln.Width = 120;
//
// gvMx1guid
@@ -469,6 +452,8 @@
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
+ this.gvMx1guid.Visible = true;
+ this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 100;
//
// tabMxPage1
@@ -497,8 +482,12 @@
this.gvAbtGuid,
this.gvMx1guid,
this.gvMxDel,
+ this.gridColumn3,
this.gvMx1ebeln,
this.gvMx1ebelnLine,
+ this.gvMx1returnFlag,
+ this.gvMx1urgentFlag,
+ this.gvMx1isdepsIn,
this.gvMx1itemNo,
this.gvMx1boardStyle,
this.gvMx1ebelnQty,
@@ -506,8 +495,6 @@
this.gvMx1subQty,
this.gvMx1okQty,
this.gvMx1okRkqty,
- this.gvMx1workNo,
- this.gvMx1urgentFlag,
this.gvMx1memo,
this.gvMx1ischeck,
this.gvMx1checkRes,
@@ -515,10 +502,8 @@
this.gvMx1checkDate,
this.gvMx1workLine,
this.gvMx1fType,
- this.gvMx1isdepsIn,
this.gvMx1dha001,
this.gvMx1cgRkqty,
- this.gvMx1returnFlag,
this.gvMx1states});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -534,6 +519,8 @@
this.gvAbtGuid.MinWidth = 50;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
+ this.gvAbtGuid.Visible = true;
+ this.gvAbtGuid.VisibleIndex = 1;
this.gvAbtGuid.Width = 94;
//
// gvMxDel
@@ -543,16 +530,16 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.VisibleIndex = 2;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -569,26 +556,17 @@
this.gv_thstatus.Tag = "query_a.thstatus";
this.gv_thstatus.Visible = true;
this.gv_thstatus.VisibleIndex = 16;
- this.gv_thstatus.Width = 79;
+ this.gv_thstatus.Width = 106;
//
// lb_fType
//
this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fType.Appearance.Options.UseFont = true;
- this.lb_fType.Location = new System.Drawing.Point(588, 55);
+ this.lb_fType.Location = new System.Drawing.Point(606, 55);
this.lb_fType.Name = "lb_fType";
- this.lb_fType.Size = new System.Drawing.Size(86, 21);
+ this.lb_fType.Size = new System.Drawing.Size(68, 21);
this.lb_fType.TabIndex = 378;
- this.lb_fType.Text = "0閲囪喘1濮斿";
- //
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(685, 51);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fType.Properties.Appearance.Options.UseFont = true;
- this.txt_fType.Size = new System.Drawing.Size(150, 28);
- this.txt_fType.TabIndex = 378;
+ this.lb_fType.Text = "濮斿鏍囧織";
//
// gv_fType
//
@@ -602,6 +580,7 @@
this.gv_fType.Name = "gv_fType";
this.gv_fType.OptionsColumn.AllowEdit = false;
this.gv_fType.Tag = "query_a.f_type";
+ this.gv_fType.UnboundDataType = typeof(bool);
this.gv_fType.Visible = true;
this.gv_fType.VisibleIndex = 0;
this.gv_fType.Width = 50;
@@ -616,15 +595,6 @@
this.lb_urgentFlag.TabIndex = 343;
this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑";
//
- // txt_urgentFlag
- //
- this.txt_urgentFlag.Location = new System.Drawing.Point(685, 14);
- this.txt_urgentFlag.Name = "txt_urgentFlag";
- this.txt_urgentFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_urgentFlag.Properties.Appearance.Options.UseFont = true;
- this.txt_urgentFlag.Size = new System.Drawing.Size(150, 28);
- this.txt_urgentFlag.TabIndex = 343;
- //
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -637,7 +607,7 @@
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.VisibleIndex = 1;
- this.gv_urgentFlag.Width = 70;
+ this.gv_urgentFlag.Width = 50;
//
// gv_insby
//
@@ -651,17 +621,17 @@
this.gv_insby.Tag = "query_a.insby";
this.gv_insby.Visible = true;
this.gv_insby.VisibleIndex = 15;
- this.gv_insby.Width = 70;
+ this.gv_insby.Width = 71;
//
// lb_ischeck
//
this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ischeck.Appearance.Options.UseFont = true;
- this.lb_ischeck.Location = new System.Drawing.Point(888, 18);
+ this.lb_ischeck.Location = new System.Drawing.Point(606, 91);
this.lb_ischeck.Name = "lb_ischeck";
this.lb_ischeck.Size = new System.Drawing.Size(68, 21);
this.lb_ischeck.TabIndex = 319;
- this.lb_ischeck.Text = "鏄惁妫�楠�";
+ this.lb_ischeck.Text = "妫�楠屾爣蹇�";
//
// gv_ischeck
//
@@ -675,17 +645,7 @@
this.gv_ischeck.Tag = "query_a.ischeck";
this.gv_ischeck.Visible = true;
this.gv_ischeck.VisibleIndex = 14;
- this.gv_ischeck.Width = 70;
- //
- // lb_sapstatus
- //
- this.lb_sapstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_sapstatus.Appearance.Options.UseFont = true;
- this.lb_sapstatus.Location = new System.Drawing.Point(842, 55);
- this.lb_sapstatus.Name = "lb_sapstatus";
- this.lb_sapstatus.Size = new System.Drawing.Size(114, 21);
- this.lb_sapstatus.TabIndex = 312;
- this.lb_sapstatus.Text = "鏄惁宸插洖鍐橲AP";
+ this.gv_ischeck.Width = 71;
//
// gv_fstatus
//
@@ -699,7 +659,7 @@
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 2;
- this.gv_fstatus.Width = 70;
+ this.gv_fstatus.Width = 50;
//
// gv_suppNo
//
@@ -713,7 +673,7 @@
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 9;
- this.gv_suppNo.Width = 70;
+ this.gv_suppNo.Width = 71;
//
// gv_depotsCode
//
@@ -727,7 +687,7 @@
this.gv_depotsCode.Tag = "query_a.depots_code";
this.gv_depotsCode.Visible = true;
this.gv_depotsCode.VisibleIndex = 8;
- this.gv_depotsCode.Width = 70;
+ this.gv_depotsCode.Width = 71;
//
// gv_checkQty
//
@@ -741,7 +701,7 @@
this.gv_checkQty.Tag = "query_a.check_qty";
this.gv_checkQty.Visible = true;
this.gv_checkQty.VisibleIndex = 13;
- this.gv_checkQty.Width = 70;
+ this.gv_checkQty.Width = 71;
//
// gv_checkRes
//
@@ -755,7 +715,7 @@
this.gv_checkRes.Tag = "query_a.check_res";
this.gv_checkRes.Visible = true;
this.gv_checkRes.VisibleIndex = 12;
- this.gv_checkRes.Width = 70;
+ this.gv_checkRes.Width = 71;
//
// gv_checkDate
//
@@ -769,7 +729,7 @@
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 70;
+ this.gv_checkDate.Width = 71;
//
// gv_checkUser
//
@@ -783,7 +743,7 @@
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 70;
+ this.gv_checkUser.Width = 71;
//
// lb_paperBillNo
//
@@ -816,7 +776,7 @@
this.gv_paperBillNo.Tag = "query_a.paper_bill_no";
this.gv_paperBillNo.Visible = true;
this.gv_paperBillNo.VisibleIndex = 11;
- this.gv_paperBillNo.Width = 70;
+ this.gv_paperBillNo.Width = 71;
//
// gv_remark
//
@@ -830,7 +790,7 @@
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 10;
- this.gv_remark.Width = 70;
+ this.gv_remark.Width = 71;
//
// gv_createDate
//
@@ -844,7 +804,7 @@
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 5;
- this.gv_createDate.Width = 70;
+ this.gv_createDate.Width = 71;
//
// gv_createBy
//
@@ -858,13 +818,13 @@
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 4;
- this.gv_createBy.Width = 70;
+ this.gv_createBy.Width = 71;
//
// lb_status
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(375, 93);
+ this.lb_status.Location = new System.Drawing.Point(375, 91);
this.lb_status.Name = "lb_status";
this.lb_status.Size = new System.Drawing.Size(34, 21);
this.lb_status.TabIndex = 216;
@@ -872,7 +832,7 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(421, 89);
+ this.txt_status.Location = new System.Drawing.Point(421, 87);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_status.Properties.Appearance.Options.UseFont = true;
@@ -910,7 +870,7 @@
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 70;
+ this.gv_billNo.Width = 71;
//
// toolBarMenu1
//
@@ -942,6 +902,9 @@
//
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.ColumnPanelRowHeight = 34;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fType,
this.gv_urgentFlag,
@@ -1024,9 +987,10 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_fType);
+ this.panel1.Controls.Add(this.txt_urgentFlag);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_ischeck);
- this.panel1.Controls.Add(this.txt_sapstatus);
this.panel1.Controls.Add(this.txt_depotsCode);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.btnSelect);
@@ -1035,11 +999,8 @@
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fType);
- this.panel1.Controls.Add(this.txt_fType);
this.panel1.Controls.Add(this.lb_urgentFlag);
- this.panel1.Controls.Add(this.txt_urgentFlag);
this.panel1.Controls.Add(this.lb_ischeck);
- this.panel1.Controls.Add(this.lb_sapstatus);
this.panel1.Controls.Add(this.lb_paperBillNo);
this.panel1.Controls.Add(this.txt_paperBillNo);
this.panel1.Controls.Add(this.lb_remark);
@@ -1065,23 +1026,16 @@
//
// txt_ischeck
//
- this.txt_ischeck.Location = new System.Drawing.Point(978, 16);
+ this.txt_ischeck.Location = new System.Drawing.Point(685, 89);
this.txt_ischeck.Name = "txt_ischeck";
this.txt_ischeck.Properties.Caption = "";
this.txt_ischeck.Size = new System.Drawing.Size(27, 24);
this.txt_ischeck.TabIndex = 447;
//
- // txt_sapstatus
- //
- this.txt_sapstatus.Location = new System.Drawing.Point(978, 53);
- this.txt_sapstatus.Name = "txt_sapstatus";
- this.txt_sapstatus.Properties.Caption = "";
- this.txt_sapstatus.Size = new System.Drawing.Size(27, 24);
- this.txt_sapstatus.TabIndex = 446;
- //
// txt_depotsCode
//
- this.txt_depotsCode.Location = new System.Drawing.Point(98, 86);
+ this.txt_depotsCode.KeyFile = "";
+ this.txt_depotsCode.Location = new System.Drawing.Point(98, 84);
this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotsCode.Name = "txt_depotsCode";
this.txt_depotsCode.Size = new System.Drawing.Size(215, 34);
@@ -1108,6 +1062,7 @@
//
// txt_suppNo
//
+ this.txt_suppNo.KeyFile = "";
this.txt_suppNo.Location = new System.Drawing.Point(98, 50);
this.txt_suppNo.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppNo.Name = "txt_suppNo";
@@ -1162,6 +1117,31 @@
this.txt_remark.Size = new System.Drawing.Size(150, 28);
this.txt_remark.TabIndex = 240;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
+ //
+ // txt_urgentFlag
+ //
+ this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
+ this.txt_urgentFlag.Name = "txt_urgentFlag";
+ this.txt_urgentFlag.Properties.Caption = "";
+ this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
+ this.txt_urgentFlag.TabIndex = 449;
+ //
+ // txt_fType
+ //
+ this.txt_fType.Location = new System.Drawing.Point(685, 53);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.Caption = "";
+ this.txt_fType.Size = new System.Drawing.Size(35, 24);
+ this.txt_fType.TabIndex = 450;
+ //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1174,8 +1154,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -1190,8 +1168,9 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_sapstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1225,7 +1204,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
@@ -1239,18 +1217,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
private DevExpress.XtraEditors.LabelControl lb_fType;
-private DevExpress.XtraEditors.TextEdit txt_fType;
private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-private DevExpress.XtraEditors.TextEdit txt_urgentFlag;
private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
private DevExpress.XtraEditors.LabelControl lb_ischeck;
private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
-
-private DevExpress.XtraEditors.LabelControl lb_sapstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
@@ -1280,10 +1254,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraEditors.CheckEdit txt_sapstatus;
private DevExpress.XtraEditors.CheckEdit txt_ischeck;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraEditors.CheckEdit txt_fType;
+ private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 18b0ae6..c09832d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -24,6 +24,10 @@
public Frm_MesInvItemArn()
{
InitializeComponent();
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ this.gridView1.ColumnPanelRowHeight = 60;
+ this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -35,7 +39,6 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
- pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -289,12 +292,22 @@
_obj.list = new List<MesInvItemArnDetail>();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
+ if (gvMx1.DataRowCount <= 0) {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ return;
+ }
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
var row = gvMx1.GetDataRow(i);
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ string _msl = row["quantity"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new MesInvItemArnDetail
{
Guid = _guid,
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 6d9acaa..b61db81 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesRohIn
+ partial class Frm_MesRohIn
{
/// <summary>
/// Required designer variable.
@@ -70,21 +70,13 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.lb_company = new DevExpress.XtraEditors.LabelControl();
- this.txt_company = new DevExpress.XtraEditors.TextEdit();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.lb_changereason = new DevExpress.XtraEditors.LabelControl();
this.txt_changereason = new DevExpress.XtraEditors.TextEdit();
this.gv_changereason = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl();
this.txt_checkFalg = new DevExpress.XtraEditors.TextEdit();
this.gv_checkFalg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_ebelnK3id = new DevExpress.XtraEditors.LabelControl();
this.txt_ebelnK3id = new DevExpress.XtraEditors.TextEdit();
@@ -115,8 +107,6 @@
this.lb_cancellationStatus = new DevExpress.XtraEditors.LabelControl();
this.txt_cancellationStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fixtureMoldProcurement = new DevExpress.XtraEditors.LabelControl();
- this.txt_fixtureMoldProcurement = new DevExpress.XtraEditors.TextEdit();
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -183,12 +173,8 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
@@ -199,7 +185,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationPerson.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fixtureMoldProcurement.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_transportMethod.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit();
@@ -408,7 +393,7 @@
this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
this.gvMx1remainingReceivedQty.Visible = true;
- this.gvMx1remainingReceivedQty.VisibleIndex = 23;
+ this.gvMx1remainingReceivedQty.VisibleIndex = 22;
this.gvMx1remainingReceivedQty.Width = 100;
//
// gvMx1totalReceivedQty
@@ -421,7 +406,7 @@
this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
this.gvMx1totalReceivedQty.Visible = true;
- this.gvMx1totalReceivedQty.VisibleIndex = 22;
+ this.gvMx1totalReceivedQty.VisibleIndex = 21;
this.gvMx1totalReceivedQty.Width = 100;
//
// gvMx1terminateTime
@@ -434,7 +419,7 @@
this.gvMx1terminateTime.Name = "gvMx1terminateTime";
this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
this.gvMx1terminateTime.Visible = true;
- this.gvMx1terminateTime.VisibleIndex = 21;
+ this.gvMx1terminateTime.VisibleIndex = 20;
this.gvMx1terminateTime.Width = 100;
//
// gvMx1terminator
@@ -447,7 +432,7 @@
this.gvMx1terminator.Name = "gvMx1terminator";
this.gvMx1terminator.Tag = "query_a.TERMINATOR";
this.gvMx1terminator.Visible = true;
- this.gvMx1terminator.VisibleIndex = 20;
+ this.gvMx1terminator.VisibleIndex = 18;
this.gvMx1terminator.Width = 100;
//
// gvMx1businessTerminate
@@ -460,7 +445,7 @@
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
- this.gvMx1businessTerminate.VisibleIndex = 24;
+ this.gvMx1businessTerminate.VisibleIndex = 23;
this.gvMx1businessTerminate.Width = 94;
//
// gvMx1freezeTime
@@ -473,7 +458,7 @@
this.gvMx1freezeTime.Name = "gvMx1freezeTime";
this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
this.gvMx1freezeTime.Visible = true;
- this.gvMx1freezeTime.VisibleIndex = 18;
+ this.gvMx1freezeTime.VisibleIndex = 16;
this.gvMx1freezeTime.Width = 100;
//
// gvMx1freezer
@@ -486,7 +471,7 @@
this.gvMx1freezer.Name = "gvMx1freezer";
this.gvMx1freezer.Tag = "query_a.FREEZER";
this.gvMx1freezer.Visible = true;
- this.gvMx1freezer.VisibleIndex = 17;
+ this.gvMx1freezer.VisibleIndex = 15;
this.gvMx1freezer.Width = 100;
//
// gvMx1businessFreeze
@@ -499,7 +484,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 21;
+ this.gvMx1businessFreeze.VisibleIndex = 19;
this.gvMx1businessFreeze.Width = 94;
//
// gvMx1businessClose
@@ -512,7 +497,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 15;
+ this.gvMx1businessClose.VisibleIndex = 14;
this.gvMx1businessClose.Width = 100;
//
// gvMx1batchNumber
@@ -525,7 +510,7 @@
this.gvMx1batchNumber.Name = "gvMx1batchNumber";
this.gvMx1batchNumber.Tag = "query_a.BATCH_NUMBER";
this.gvMx1batchNumber.Visible = true;
- this.gvMx1batchNumber.VisibleIndex = 19;
+ this.gvMx1batchNumber.VisibleIndex = 17;
this.gvMx1batchNumber.Width = 94;
//
// gvMx1outsourcingOrderId
@@ -725,8 +710,8 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 220);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1361, 291);
+ this.tabMxPage1.Text = "閲囪喘鍗曟槑缁�";
//
// gcMx1
//
@@ -734,7 +719,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 220);
+ this.gcMx1.Size = new System.Drawing.Size(1361, 291);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -787,49 +772,11 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // lb_company
- //
- this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_company.Appearance.Options.UseFont = true;
- this.lb_company.Location = new System.Drawing.Point(789, 52);
- this.lb_company.Name = "lb_company";
- this.lb_company.Size = new System.Drawing.Size(73, 21);
- this.lb_company.TabIndex = 471;
- this.lb_company.Text = "鍏徃缂栧彿 ";
- //
- // txt_company
- //
- this.txt_company.Location = new System.Drawing.Point(871, 48);
- this.txt_company.Name = "txt_company";
- this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_company.Properties.Appearance.Options.UseFont = true;
- this.txt_company.Size = new System.Drawing.Size(150, 28);
- this.txt_company.TabIndex = 471;
- //
- // lb_factory
- //
- this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(570, 52);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(39, 21);
- this.lb_factory.TabIndex = 460;
- this.lb_factory.Text = "宸ュ巶 ";
- //
- // txt_factory
- //
- this.txt_factory.Location = new System.Drawing.Point(614, 48);
- this.txt_factory.Name = "txt_factory";
- this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(150, 28);
- this.txt_factory.TabIndex = 460;
- //
// lb_changereason
//
this.lb_changereason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_changereason.Appearance.Options.UseFont = true;
- this.lb_changereason.Location = new System.Drawing.Point(789, 244);
+ this.lb_changereason.Location = new System.Drawing.Point(532, 183);
this.lb_changereason.Name = "lb_changereason";
this.lb_changereason.Size = new System.Drawing.Size(73, 21);
this.lb_changereason.TabIndex = 450;
@@ -837,7 +784,7 @@
//
// txt_changereason
//
- this.txt_changereason.Location = new System.Drawing.Point(871, 240);
+ this.txt_changereason.Location = new System.Drawing.Point(614, 179);
this.txt_changereason.Name = "txt_changereason";
this.txt_changereason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_changereason.Properties.Appearance.Options.UseFont = true;
@@ -862,7 +809,7 @@
//
this.lb_checkFalg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkFalg.Appearance.Options.UseFont = true;
- this.lb_checkFalg.Location = new System.Drawing.Point(270, 276);
+ this.lb_checkFalg.Location = new System.Drawing.Point(1029, 212);
this.lb_checkFalg.Name = "lb_checkFalg";
this.lb_checkFalg.Size = new System.Drawing.Size(73, 21);
this.lb_checkFalg.TabIndex = 387;
@@ -870,11 +817,11 @@
//
// txt_checkFalg
//
- this.txt_checkFalg.Location = new System.Drawing.Point(349, 272);
+ this.txt_checkFalg.Location = new System.Drawing.Point(1109, 208);
this.txt_checkFalg.Name = "txt_checkFalg";
this.txt_checkFalg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkFalg.Properties.Appearance.Options.UseFont = true;
- this.txt_checkFalg.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkFalg.Size = new System.Drawing.Size(174, 28);
this.txt_checkFalg.TabIndex = 387;
//
// gv_checkFalg
@@ -891,25 +838,6 @@
this.gv_checkFalg.VisibleIndex = 27;
this.gv_checkFalg.Width = 100;
//
- // lb_checkBy
- //
- this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkBy.Appearance.Options.UseFont = true;
- this.lb_checkBy.Location = new System.Drawing.Point(20, 276);
- this.lb_checkBy.Name = "lb_checkBy";
- this.lb_checkBy.Size = new System.Drawing.Size(56, 21);
- this.lb_checkBy.TabIndex = 378;
- this.lb_checkBy.Text = "瀹℃牳浜� ";
- //
- // txt_checkBy
- //
- this.txt_checkBy.Location = new System.Drawing.Point(97, 272);
- this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
- this.txt_checkBy.TabIndex = 378;
- //
// gv_checkBy
//
this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -923,25 +851,6 @@
this.gv_checkBy.Visible = true;
this.gv_checkBy.VisibleIndex = 26;
this.gv_checkBy.Width = 100;
- //
- // lb_checkDate
- //
- this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(536, 244);
- this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
- this.lb_checkDate.TabIndex = 370;
- this.lb_checkDate.Text = "瀹℃牳鏃ユ湡 ";
- //
- // txt_checkDate
- //
- this.txt_checkDate.Location = new System.Drawing.Point(614, 240);
- this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
- this.txt_checkDate.TabIndex = 370;
//
// gv_checkDate
//
@@ -961,7 +870,7 @@
//
this.lb_ebelnK3id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ebelnK3id.Appearance.Options.UseFont = true;
- this.lb_ebelnK3id.Location = new System.Drawing.Point(775, 182);
+ this.lb_ebelnK3id.Location = new System.Drawing.Point(775, 148);
this.lb_ebelnK3id.Name = "lb_ebelnK3id";
this.lb_ebelnK3id.Size = new System.Drawing.Size(87, 21);
this.lb_ebelnK3id.TabIndex = 360;
@@ -969,7 +878,7 @@
//
// txt_ebelnK3id
//
- this.txt_ebelnK3id.Location = new System.Drawing.Point(871, 178);
+ this.txt_ebelnK3id.Location = new System.Drawing.Point(871, 144);
this.txt_ebelnK3id.Name = "txt_ebelnK3id";
this.txt_ebelnK3id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ebelnK3id.Properties.Appearance.Options.UseFont = true;
@@ -980,7 +889,7 @@
//
this.lb_erpCheckDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_erpCheckDate.Appearance.Options.UseFont = true;
- this.lb_erpCheckDate.Location = new System.Drawing.Point(270, 244);
+ this.lb_erpCheckDate.Location = new System.Drawing.Point(1029, 182);
this.lb_erpCheckDate.Name = "lb_erpCheckDate";
this.lb_erpCheckDate.Size = new System.Drawing.Size(73, 21);
this.lb_erpCheckDate.TabIndex = 351;
@@ -988,11 +897,11 @@
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(349, 240);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(1109, 178);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
this.txt_erpCheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_erpCheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_erpCheckDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(174, 28);
this.txt_erpCheckDate.TabIndex = 351;
//
// gv_erpCheckDate
@@ -1013,7 +922,7 @@
//
this.lb_erpCheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_erpCheckBy.Appearance.Options.UseFont = true;
- this.lb_erpCheckBy.Location = new System.Drawing.Point(20, 244);
+ this.lb_erpCheckBy.Location = new System.Drawing.Point(1046, 148);
this.lb_erpCheckBy.Name = "lb_erpCheckBy";
this.lb_erpCheckBy.Size = new System.Drawing.Size(56, 21);
this.lb_erpCheckBy.TabIndex = 343;
@@ -1021,11 +930,11 @@
//
// txt_erpCheckBy
//
- this.txt_erpCheckBy.Location = new System.Drawing.Point(97, 240);
+ this.txt_erpCheckBy.Location = new System.Drawing.Point(1109, 144);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
this.txt_erpCheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_erpCheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_erpCheckBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(174, 28);
this.txt_erpCheckBy.TabIndex = 343;
//
// gv_erpCheckBy
@@ -1046,19 +955,19 @@
//
this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(772, 212);
+ this.lb_lastupdateBy.Location = new System.Drawing.Point(1046, 116);
this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
+ this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
this.lb_lastupdateBy.TabIndex = 336;
- this.lb_lastupdateBy.Text = "鏈�鍚庝慨鏀逛汉 ";
+ this.lb_lastupdateBy.Text = "淇敼浜� ";
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(871, 208);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(1109, 112);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(174, 28);
this.txt_lastupdateBy.TabIndex = 336;
//
// gv_lastupdateBy
@@ -1079,19 +988,19 @@
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(502, 212);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(1029, 84);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
+ this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
this.lb_lastupdateDate.TabIndex = 327;
- this.lb_lastupdateDate.Text = "鏈�鍚庝慨鏀规椂闂� ";
+ this.lb_lastupdateDate.Text = "淇敼鏃堕棿 ";
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(614, 208);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(1109, 80);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(174, 28);
this.txt_lastupdateDate.TabIndex = 327;
//
// gv_lastupdateDate
@@ -1112,7 +1021,7 @@
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(270, 212);
+ this.lb_createDate.Location = new System.Drawing.Point(1029, 52);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 319;
@@ -1120,11 +1029,11 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(349, 208);
+ this.txt_createDate.Location = new System.Drawing.Point(1109, 48);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(174, 28);
this.txt_createDate.TabIndex = 319;
//
// gv_createDate
@@ -1145,7 +1054,7 @@
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(20, 212);
+ this.lb_createBy.Location = new System.Drawing.Point(1046, 18);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(56, 21);
this.lb_createBy.TabIndex = 312;
@@ -1153,11 +1062,11 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(97, 208);
+ this.txt_createBy.Location = new System.Drawing.Point(1109, 14);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(174, 28);
this.txt_createBy.TabIndex = 312;
//
// gv_createBy
@@ -1178,7 +1087,7 @@
//
this.lb_cancellationDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_cancellationDate.Appearance.Options.UseFont = true;
- this.lb_cancellationDate.Location = new System.Drawing.Point(536, 182);
+ this.lb_cancellationDate.Location = new System.Drawing.Point(536, 148);
this.lb_cancellationDate.Name = "lb_cancellationDate";
this.lb_cancellationDate.Size = new System.Drawing.Size(73, 21);
this.lb_cancellationDate.TabIndex = 306;
@@ -1186,7 +1095,7 @@
//
// txt_cancellationDate
//
- this.txt_cancellationDate.Location = new System.Drawing.Point(614, 178);
+ this.txt_cancellationDate.Location = new System.Drawing.Point(614, 144);
this.txt_cancellationDate.Name = "txt_cancellationDate";
this.txt_cancellationDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_cancellationDate.Properties.Appearance.Options.UseFont = true;
@@ -1270,33 +1179,14 @@
this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
- this.gv_cancellationStatus.VisibleIndex = 17;
+ this.gv_cancellationStatus.VisibleIndex = 16;
this.gv_cancellationStatus.Width = 50;
- //
- // lb_fixtureMoldProcurement
- //
- this.lb_fixtureMoldProcurement.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fixtureMoldProcurement.Appearance.Options.UseFont = true;
- this.lb_fixtureMoldProcurement.Location = new System.Drawing.Point(520, 276);
- this.lb_fixtureMoldProcurement.Name = "lb_fixtureMoldProcurement";
- this.lb_fixtureMoldProcurement.Size = new System.Drawing.Size(175, 21);
- this.lb_fixtureMoldProcurement.TabIndex = 285;
- this.lb_fixtureMoldProcurement.Text = "娌诲叿涓舵ā鍏峰姞宸ュ強閲囪喘 ";
- //
- // txt_fixtureMoldProcurement
- //
- this.txt_fixtureMoldProcurement.Location = new System.Drawing.Point(701, 272);
- this.txt_fixtureMoldProcurement.Name = "txt_fixtureMoldProcurement";
- this.txt_fixtureMoldProcurement.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fixtureMoldProcurement.Properties.Appearance.Options.UseFont = true;
- this.txt_fixtureMoldProcurement.Size = new System.Drawing.Size(150, 28);
- this.txt_fixtureMoldProcurement.TabIndex = 285;
//
// lb_remarks
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(823, 148);
+ this.lb_remarks.Location = new System.Drawing.Point(823, 116);
this.lb_remarks.Name = "lb_remarks";
this.lb_remarks.Size = new System.Drawing.Size(39, 21);
this.lb_remarks.TabIndex = 280;
@@ -1304,7 +1194,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(871, 144);
+ this.txt_remarks.Location = new System.Drawing.Point(871, 112);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
@@ -1329,7 +1219,7 @@
//
this.lb_transportMethod.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_transportMethod.Appearance.Options.UseFont = true;
- this.lb_transportMethod.Location = new System.Drawing.Point(536, 148);
+ this.lb_transportMethod.Location = new System.Drawing.Point(536, 116);
this.lb_transportMethod.Name = "lb_transportMethod";
this.lb_transportMethod.Size = new System.Drawing.Size(73, 21);
this.lb_transportMethod.TabIndex = 273;
@@ -1337,7 +1227,7 @@
//
// txt_transportMethod
//
- this.txt_transportMethod.Location = new System.Drawing.Point(614, 144);
+ this.txt_transportMethod.Location = new System.Drawing.Point(614, 112);
this.txt_transportMethod.Name = "txt_transportMethod";
this.txt_transportMethod.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_transportMethod.Properties.Appearance.Options.UseFont = true;
@@ -1414,7 +1304,7 @@
//
this.lb_settlementParty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_settlementParty.Appearance.Options.UseFont = true;
- this.lb_settlementParty.Location = new System.Drawing.Point(806, 116);
+ this.lb_settlementParty.Location = new System.Drawing.Point(806, 84);
this.lb_settlementParty.Name = "lb_settlementParty";
this.lb_settlementParty.Size = new System.Drawing.Size(56, 21);
this.lb_settlementParty.TabIndex = 258;
@@ -1422,7 +1312,7 @@
//
// txt_settlementParty
//
- this.txt_settlementParty.Location = new System.Drawing.Point(871, 112);
+ this.txt_settlementParty.Location = new System.Drawing.Point(871, 80);
this.txt_settlementParty.Name = "txt_settlementParty";
this.txt_settlementParty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_settlementParty.Properties.Appearance.Options.UseFont = true;
@@ -1447,7 +1337,7 @@
//
this.lb_qualityReq.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qualityReq.Appearance.Options.UseFont = true;
- this.lb_qualityReq.Location = new System.Drawing.Point(536, 116);
+ this.lb_qualityReq.Location = new System.Drawing.Point(536, 84);
this.lb_qualityReq.Name = "lb_qualityReq";
this.lb_qualityReq.Size = new System.Drawing.Size(73, 21);
this.lb_qualityReq.TabIndex = 252;
@@ -1455,7 +1345,7 @@
//
// txt_qualityReq
//
- this.txt_qualityReq.Location = new System.Drawing.Point(614, 112);
+ this.txt_qualityReq.Location = new System.Drawing.Point(614, 80);
this.txt_qualityReq.Name = "txt_qualityReq";
this.txt_qualityReq.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qualityReq.Properties.Appearance.Options.UseFont = true;
@@ -1506,7 +1396,7 @@
this.gv_purchaser.OptionsColumn.AllowEdit = false;
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
- this.gv_purchaser.VisibleIndex = 11;
+ this.gv_purchaser.VisibleIndex = 10;
this.gv_purchaser.Width = 100;
//
// lb_qtyAcceptance
@@ -1539,14 +1429,14 @@
this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
this.gv_qtyAcceptance.Visible = true;
- this.gv_qtyAcceptance.VisibleIndex = 10;
+ this.gv_qtyAcceptance.VisibleIndex = 9;
this.gv_qtyAcceptance.Width = 50;
//
// lb_purchaseGroup
//
this.lb_purchaseGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_purchaseGroup.Appearance.Options.UseFont = true;
- this.lb_purchaseGroup.Location = new System.Drawing.Point(806, 84);
+ this.lb_purchaseGroup.Location = new System.Drawing.Point(806, 52);
this.lb_purchaseGroup.Name = "lb_purchaseGroup";
this.lb_purchaseGroup.Size = new System.Drawing.Size(56, 21);
this.lb_purchaseGroup.TabIndex = 240;
@@ -1554,7 +1444,7 @@
//
// txt_purchaseGroup
//
- this.txt_purchaseGroup.Location = new System.Drawing.Point(871, 80);
+ this.txt_purchaseGroup.Location = new System.Drawing.Point(871, 48);
this.txt_purchaseGroup.Name = "txt_purchaseGroup";
this.txt_purchaseGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_purchaseGroup.Properties.Appearance.Options.UseFont = true;
@@ -1565,7 +1455,7 @@
//
this.lb_purchaseDept.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_purchaseDept.Appearance.Options.UseFont = true;
- this.lb_purchaseDept.Location = new System.Drawing.Point(536, 84);
+ this.lb_purchaseDept.Location = new System.Drawing.Point(536, 52);
this.lb_purchaseDept.Name = "lb_purchaseDept";
this.lb_purchaseDept.Size = new System.Drawing.Size(73, 21);
this.lb_purchaseDept.TabIndex = 235;
@@ -1573,7 +1463,7 @@
//
// txt_purchaseDept
//
- this.txt_purchaseDept.Location = new System.Drawing.Point(614, 80);
+ this.txt_purchaseDept.Location = new System.Drawing.Point(614, 48);
this.txt_purchaseDept.Name = "txt_purchaseDept";
this.txt_purchaseDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_purchaseDept.Properties.Appearance.Options.UseFont = true;
@@ -1591,7 +1481,7 @@
this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
this.gv_purchaseDept.Visible = true;
- this.gv_purchaseDept.VisibleIndex = 9;
+ this.gv_purchaseDept.VisibleIndex = 8;
this.gv_purchaseDept.Width = 110;
//
// lb_purchaseOrg
@@ -1853,7 +1743,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_rohin{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1365, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_rohin{}";
@@ -1865,7 +1755,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.Size = new System.Drawing.Size(1328, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -1927,7 +1817,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1365, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -1938,7 +1828,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1328, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// pageBar1
@@ -1950,7 +1840,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 50;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1328, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -1960,16 +1850,16 @@
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1363, 570);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 318);
+ this.tabMx.Location = new System.Drawing.Point(0, 247);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 252);
+ this.tabMx.Size = new System.Drawing.Size(1363, 323);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1979,18 +1869,10 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_company);
- this.panel1.Controls.Add(this.txt_company);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.lb_changereason);
this.panel1.Controls.Add(this.txt_changereason);
this.panel1.Controls.Add(this.lb_checkFalg);
this.panel1.Controls.Add(this.txt_checkFalg);
- this.panel1.Controls.Add(this.lb_checkBy);
- this.panel1.Controls.Add(this.txt_checkBy);
- this.panel1.Controls.Add(this.lb_checkDate);
- this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.lb_ebelnK3id);
this.panel1.Controls.Add(this.txt_ebelnK3id);
this.panel1.Controls.Add(this.lb_erpCheckDate);
@@ -2011,8 +1893,6 @@
this.panel1.Controls.Add(this.txt_cancellationPerson);
this.panel1.Controls.Add(this.lb_cancellationStatus);
this.panel1.Controls.Add(this.txt_cancellationStatus);
- this.panel1.Controls.Add(this.lb_fixtureMoldProcurement);
- this.panel1.Controls.Add(this.txt_fixtureMoldProcurement);
this.panel1.Controls.Add(this.lb_remarks);
this.panel1.Controls.Add(this.txt_remarks);
this.panel1.Controls.Add(this.lb_transportMethod);
@@ -2053,12 +1933,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 318);
+ this.panel1.Size = new System.Drawing.Size(1363, 247);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(905, 282);
+ this.labelControl11.Location = new System.Drawing.Point(823, 189);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2069,7 +1949,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(956, 282);
+ this.lbGuid.Location = new System.Drawing.Point(874, 189);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -2079,19 +1959,15 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1365, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesRohIn";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
@@ -2102,7 +1978,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationPerson.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fixtureMoldProcurement.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_transportMethod.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit();
@@ -2135,7 +2010,7 @@
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -2145,180 +2020,166 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentLineId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandSource;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1changeFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1planTrackingId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandTrackingId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentType;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableStoredQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableReceivedQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalReturnedQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remainingStoredQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalStoredQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remainingReceivedQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalReceivedQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminateTime;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminator;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessTerminate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1freezeTime;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1freezer;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessFreeze;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessClose;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1batchNumber;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1outsourcingOrderId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remarks;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isGift;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1latestDeliveryDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1earliestDeliveryDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderLineId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_company;
-private DevExpress.XtraEditors.TextEdit txt_company;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentLineId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandSource;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1changeFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1planTrackingId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandTrackingId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentType;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableStoredQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableReceivedQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalReturnedQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1remainingStoredQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalStoredQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1remainingReceivedQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1totalReceivedQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminateTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminator;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessTerminate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1freezeTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1freezer;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessFreeze;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessClose;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1batchNumber;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1outsourcingOrderId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1remarks;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1isGift;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1latestDeliveryDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1earliestDeliveryDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliveryDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderLineId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_factory;
-private DevExpress.XtraEditors.TextEdit txt_factory;
+ private DevExpress.XtraEditors.LabelControl lb_changereason;
+ private DevExpress.XtraEditors.TextEdit txt_changereason;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_changereason;
-private DevExpress.XtraEditors.LabelControl lb_changereason;
-private DevExpress.XtraEditors.TextEdit txt_changereason;
- private DevExpress.XtraGrid.Columns.GridColumn gv_changereason;
+ private DevExpress.XtraEditors.LabelControl lb_checkFalg;
+ private DevExpress.XtraEditors.TextEdit txt_checkFalg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-private DevExpress.XtraEditors.LabelControl lb_checkFalg;
-private DevExpress.XtraEditors.TextEdit txt_checkFalg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg;
+ private DevExpress.XtraEditors.LabelControl lb_ebelnK3id;
+ private DevExpress.XtraEditors.TextEdit txt_ebelnK3id;
-private DevExpress.XtraEditors.LabelControl lb_checkBy;
-private DevExpress.XtraEditors.TextEdit txt_checkBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
+ private DevExpress.XtraEditors.LabelControl lb_erpCheckDate;
+ private DevExpress.XtraEditors.TextEdit txt_erpCheckDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckDate;
-private DevExpress.XtraEditors.LabelControl lb_checkDate;
-private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private DevExpress.XtraEditors.LabelControl lb_erpCheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckBy;
-private DevExpress.XtraEditors.LabelControl lb_ebelnK3id;
-private DevExpress.XtraEditors.TextEdit txt_ebelnK3id;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
-private DevExpress.XtraEditors.LabelControl lb_erpCheckDate;
-private DevExpress.XtraEditors.TextEdit txt_erpCheckDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckDate;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-private DevExpress.XtraEditors.LabelControl lb_erpCheckBy;
-private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckBy;
+ private DevExpress.XtraEditors.LabelControl lb_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraEditors.LabelControl lb_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+ private DevExpress.XtraEditors.LabelControl lb_cancellationDate;
+ private DevExpress.XtraEditors.TextEdit txt_cancellationDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationDate;
-private DevExpress.XtraEditors.LabelControl lb_createDate;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraEditors.LabelControl lb_cancellationPerson;
+ private DevExpress.XtraEditors.TextEdit txt_cancellationPerson;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationPerson;
-private DevExpress.XtraEditors.LabelControl lb_createBy;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraEditors.LabelControl lb_cancellationStatus;
+ private DevExpress.XtraEditors.TextEdit txt_cancellationStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationStatus;
-private DevExpress.XtraEditors.LabelControl lb_cancellationDate;
-private DevExpress.XtraEditors.TextEdit txt_cancellationDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationDate;
+ private DevExpress.XtraEditors.LabelControl lb_remarks;
+ private DevExpress.XtraEditors.TextEdit txt_remarks;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
-private DevExpress.XtraEditors.LabelControl lb_cancellationPerson;
-private DevExpress.XtraEditors.TextEdit txt_cancellationPerson;
- private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationPerson;
+ private DevExpress.XtraEditors.LabelControl lb_transportMethod;
+ private DevExpress.XtraEditors.TextEdit txt_transportMethod;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_transportMethod;
-private DevExpress.XtraEditors.LabelControl lb_cancellationStatus;
-private DevExpress.XtraEditors.TextEdit txt_cancellationStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationStatus;
+ private DevExpress.XtraEditors.LabelControl lb_email;
+ private DevExpress.XtraEditors.TextEdit txt_email;
-private DevExpress.XtraEditors.LabelControl lb_fixtureMoldProcurement;
-private DevExpress.XtraEditors.TextEdit txt_fixtureMoldProcurement;
+ private DevExpress.XtraEditors.LabelControl lb_paymentParty;
+ private DevExpress.XtraEditors.TextEdit txt_paymentParty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_paymentParty;
-private DevExpress.XtraEditors.LabelControl lb_remarks;
-private DevExpress.XtraEditors.TextEdit txt_remarks;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
+ private DevExpress.XtraEditors.LabelControl lb_settlementParty;
+ private DevExpress.XtraEditors.TextEdit txt_settlementParty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_settlementParty;
-private DevExpress.XtraEditors.LabelControl lb_transportMethod;
-private DevExpress.XtraEditors.TextEdit txt_transportMethod;
- private DevExpress.XtraGrid.Columns.GridColumn gv_transportMethod;
+ private DevExpress.XtraEditors.LabelControl lb_qualityReq;
+ private DevExpress.XtraEditors.TextEdit txt_qualityReq;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qualityReq;
-private DevExpress.XtraEditors.LabelControl lb_email;
-private DevExpress.XtraEditors.TextEdit txt_email;
+ private DevExpress.XtraEditors.LabelControl lb_purchaser;
+ private DevExpress.XtraEditors.TextEdit txt_purchaser;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
-private DevExpress.XtraEditors.LabelControl lb_paymentParty;
-private DevExpress.XtraEditors.TextEdit txt_paymentParty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_paymentParty;
+ private DevExpress.XtraEditors.LabelControl lb_qtyAcceptance;
+ private DevExpress.XtraEditors.TextEdit txt_qtyAcceptance;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qtyAcceptance;
-private DevExpress.XtraEditors.LabelControl lb_settlementParty;
-private DevExpress.XtraEditors.TextEdit txt_settlementParty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_settlementParty;
+ private DevExpress.XtraEditors.LabelControl lb_purchaseGroup;
+ private DevExpress.XtraEditors.TextEdit txt_purchaseGroup;
-private DevExpress.XtraEditors.LabelControl lb_qualityReq;
-private DevExpress.XtraEditors.TextEdit txt_qualityReq;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qualityReq;
+ private DevExpress.XtraEditors.LabelControl lb_purchaseDept;
+ private DevExpress.XtraEditors.TextEdit txt_purchaseDept;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
-private DevExpress.XtraEditors.LabelControl lb_purchaser;
-private DevExpress.XtraEditors.TextEdit txt_purchaser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
+ private DevExpress.XtraEditors.LabelControl lb_purchaseOrg;
+ private DevExpress.XtraEditors.TextEdit txt_purchaseOrg;
-private DevExpress.XtraEditors.LabelControl lb_qtyAcceptance;
-private DevExpress.XtraEditors.TextEdit txt_qtyAcceptance;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qtyAcceptance;
+ private DevExpress.XtraEditors.LabelControl lb_closeStatus;
+ private DevExpress.XtraEditors.TextEdit txt_closeStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-private DevExpress.XtraEditors.LabelControl lb_purchaseGroup;
-private DevExpress.XtraEditors.TextEdit txt_purchaseGroup;
+ private DevExpress.XtraEditors.LabelControl lb_supplier;
+ private DevExpress.XtraEditors.TextEdit txt_supplier;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplier;
-private DevExpress.XtraEditors.LabelControl lb_purchaseDept;
-private DevExpress.XtraEditors.TextEdit txt_purchaseDept;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
+ private DevExpress.XtraEditors.LabelControl lb_purchaseDate;
+ private DevExpress.XtraEditors.TextEdit txt_purchaseDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDate;
-private DevExpress.XtraEditors.LabelControl lb_purchaseOrg;
-private DevExpress.XtraEditors.TextEdit txt_purchaseOrg;
+ private DevExpress.XtraEditors.LabelControl lb_businessType;
+ private DevExpress.XtraEditors.TextEdit txt_businessType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
-private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-private DevExpress.XtraEditors.TextEdit txt_closeStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
+ private DevExpress.XtraEditors.LabelControl lb_documentType;
+ private DevExpress.XtraEditors.TextEdit txt_documentType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_documentType;
-private DevExpress.XtraEditors.LabelControl lb_supplier;
-private DevExpress.XtraEditors.TextEdit txt_supplier;
- private DevExpress.XtraGrid.Columns.GridColumn gv_supplier;
+ private DevExpress.XtraEditors.LabelControl lb_documentStatus;
+ private DevExpress.XtraEditors.TextEdit txt_documentStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
-private DevExpress.XtraEditors.LabelControl lb_purchaseDate;
-private DevExpress.XtraEditors.TextEdit txt_purchaseDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDate;
-
-private DevExpress.XtraEditors.LabelControl lb_businessType;
-private DevExpress.XtraEditors.TextEdit txt_businessType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
-
-private DevExpress.XtraEditors.LabelControl lb_documentType;
-private DevExpress.XtraEditors.TextEdit txt_documentType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_documentType;
-
-private DevExpress.XtraEditors.LabelControl lb_documentStatus;
-private DevExpress.XtraEditors.TextEdit txt_documentStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
-
-private DevExpress.XtraEditors.LabelControl lb_billNo;
-private DevExpress.XtraEditors.TextEdit txt_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraEditors.LabelControl lb_billNo;
+ private DevExpress.XtraEditors.TextEdit txt_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c9364ac..db9c314 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -400,6 +400,12 @@
<Compile Include="UserControl\UcComBox.Designer.cs">
<DependentUpon>UcComBox.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLoading.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLoading.Designer.cs">
+ <DependentUpon>UcLoading.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookCk.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -441,6 +447,12 @@
</Compile>
<Compile Include="UserControl\UcToolBarMenu.Designer.cs">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\XtraUserControl1.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\XtraUserControl1.Designer.cs">
+ <DependentUpon>XtraUserControl1.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
@@ -536,8 +548,8 @@
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="TestForm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
@@ -553,6 +565,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcComBox.resx">
<DependentUpon>UcComBox.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLoading.resx">
+ <DependentUpon>UcLoading.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookCk.resx">
<DependentUpon>UcLookCk.cs</DependentUpon>
@@ -575,6 +590,9 @@
<EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
+ <DependentUpon>XtraUserControl1.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 1a46a50..6104d54 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -36,8 +36,8 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new TestForm.XtraForm1());
- //return;
+ Application.Run(new TestForm.XtraForm1());
+ return;
var fmLogin = new FrmLogin();
if (fmLogin.IsDisposed == false)
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index bd02e93..3445933 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -128,8 +128,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
+ <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -138,8 +143,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap,
+ <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>
@@ -163,11 +168,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -175,11 +175,6 @@
</data>
<data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -203,8 +198,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
+ <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -238,6 +233,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -265,6 +265,11 @@
</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="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
@@ -296,8 +301,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
+ <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -379,11 +384,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -421,6 +421,11 @@
</data>
<data name="find_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\find_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -464,8 +469,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap,
+ <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -479,8 +484,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,
+ <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>
@@ -524,8 +529,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap,
+ <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -574,8 +579,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
+ <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -599,10 +604,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -618,8 +621,5 @@
<value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_16x161.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/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 9e31aef..2d440a6 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -28,103 +28,65 @@
/// </summary>
private void InitializeComponent()
{
- this.label2 = new System.Windows.Forms.Label();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.ucLookCk1 = new Gs.DevApp.UserControl.UcLookCk();
- this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.xtraUserControl11 = new Gs.DevApp.UserControl.XtraUserControl1();
this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
- this.ucLookItems1 = new Gs.DevApp.UserControl.UcLookItems();
- this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
this.SuspendLayout();
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(45, 71);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(38, 18);
- this.label2.TabIndex = 8;
- this.label2.Text = "浠撳簱";
//
// simpleButton1
//
- this.simpleButton1.Location = new System.Drawing.Point(48, 106);
+ this.simpleButton1.Location = new System.Drawing.Point(327, 203);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
- this.simpleButton1.TabIndex = 9;
+ this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
//
- // ucLookCk1
+ // richTextBox1
//
- this.ucLookCk1.KeyFile = "";
- this.ucLookCk1.Location = new System.Drawing.Point(48, 24);
- this.ucLookCk1.Margin = new System.Windows.Forms.Padding(0);
- this.ucLookCk1.Name = "ucLookCk1";
- this.ucLookCk1.Size = new System.Drawing.Size(219, 30);
- this.ucLookCk1.TabIndex = 7;
+ this.richTextBox1.Location = new System.Drawing.Point(247, 37);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(250, 96);
+ this.richTextBox1.TabIndex = 1;
+ this.richTextBox1.Text = "";
//
- // ucLookSupplier1
+ // xtraUserControl11
//
- this.ucLookSupplier1.KeyFile = "";
- this.ucLookSupplier1.Location = new System.Drawing.Point(489, 24);
- this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
- this.ucLookSupplier1.Name = "ucLookSupplier1";
- this.ucLookSupplier1.Size = new System.Drawing.Size(228, 30);
- this.ucLookSupplier1.TabIndex = 10;
+ this.xtraUserControl11.Location = new System.Drawing.Point(116, 137);
+ this.xtraUserControl11.Name = "xtraUserControl11";
+ this.xtraUserControl11.Size = new System.Drawing.Size(150, 150);
+ this.xtraUserControl11.TabIndex = 2;
//
// simpleButton2
//
- this.simpleButton2.Location = new System.Drawing.Point(546, 93);
+ this.simpleButton2.Location = new System.Drawing.Point(590, 203);
this.simpleButton2.Name = "simpleButton2";
this.simpleButton2.Size = new System.Drawing.Size(94, 29);
- this.simpleButton2.TabIndex = 11;
+ this.simpleButton2.TabIndex = 3;
this.simpleButton2.Text = "simpleButton2";
this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
- //
- // ucLookItems1
- //
- this.ucLookItems1.KeyFile = "";
- this.ucLookItems1.Location = new System.Drawing.Point(525, 189);
- this.ucLookItems1.Name = "ucLookItems1";
- this.ucLookItems1.Size = new System.Drawing.Size(266, 33);
- this.ucLookItems1.TabIndex = 12;
- //
- // simpleButton3
- //
- this.simpleButton3.Location = new System.Drawing.Point(525, 268);
- this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(94, 29);
- this.simpleButton3.TabIndex = 13;
- this.simpleButton3.Text = "simpleButton3";
- this.simpleButton3.Click += new System.EventHandler(this.simpleButton3_Click);
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(890, 396);
- this.Controls.Add(this.simpleButton3);
- this.Controls.Add(this.ucLookItems1);
this.Controls.Add(this.simpleButton2);
- this.Controls.Add(this.ucLookSupplier1);
+ this.Controls.Add(this.xtraUserControl11);
+ this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.simpleButton1);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.ucLookCk1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- private UserControl.UcLookCk ucLookCk1;
- private System.Windows.Forms.Label label2;
+
private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private UserControl.UcLookSupplier ucLookSupplier1;
+ private System.Windows.Forms.RichTextBox richTextBox1;
+ private UserControl.XtraUserControl1 xtraUserControl11;
private DevExpress.XtraEditors.SimpleButton simpleButton2;
- private UserControl.UcLookItems ucLookItems1;
- private DevExpress.XtraEditors.SimpleButton simpleButton3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index 6cc4399..b2d5397 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -1,46 +1,143 @@
锘縰sing System;
using System.Data;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Text;
using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows.Media.Animation;
+using DevExpress.Internal.WinApi.Windows.UI.Notifications;
using DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Import.OpenXml;
+using DevExpress.XtraTreeList.Data;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
namespace Gs.DevApp.TestForm
{
public partial class XtraForm1 : XtraForm
{
+
+ //https://www.cnblogs.com/China3S/p/3452008.html
public XtraForm1()
{
InitializeComponent();
- // this.ucLookCk1.KeyFile = "depotId";
- this.ucLookCk1.KeyFile = "depotCode";
- this.ucLookItems1.KeyFile = "id";
- ucLookCk1.EditChanged += UcLookCk1_EditChanged;
+ //dddddddd();
+
+ //await Task.Run(() =>
+ //{
+
+ //});
}
- private void UcLookCk1_EditChanged(object sender, EventArgs e)
- {
- string id = ucLookCk1.GetId();
- string code = ucLookCk1.GetCode();
- string name = ucLookCk1.GetName();
- label2.Text = "id:" + id + ",code:" + code + ",name:" + name;
+ private async void dddddddd() {
+
+
+ UcLoading _loading = new UcLoading();
+ var pgq = new PageQueryModel(1, 999999, "item_name", "asc", "",
+ " and fforbidstatus='A'");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ //var strReturn = await UtilityHelper.HttpPostAsync("",
+ // "MesItemsManager/GetListPageByLook", json);
+ //var rtn = UtilityHelper.ReturnToList(strReturn);
+ //var dt = rtn.rtnData;
+
+ await csd();
+
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
}
- private void simpleButton1_Click(object sender, EventArgs e)
+ private async Task<int> csd()
{
- //ucLookCk1.SetCode("101087");
- ucLookCk1.SetIdOrCode("1.04.001");
+ int c = 0;
+ //await Task.Delay(1000);
+ await Task.Run(() =>
+ {
+
+ for (int i = 0; i < 10000; i++)
+ {
+ c = c + i;
+ if (richTextBox1.InvokeRequired)
+ {
+ richTextBox1.BeginInvoke(new Action(() =>
+ {
+ richTextBox1.Text = c.ToString();
+ }));
+ }
+ else
+ {
+ richTextBox1.Text = c.ToString();
+ }
+ }
+
+ });
+ return c;
+
+ }
+ private void simpleButton1_Click_1(object sender, EventArgs e)
+ {
+ dddddddd();
}
- private void simpleButton2_Click(object sender, EventArgs e)
+
+ private async void simpleButton2_Click(object sender, EventArgs e)
{
- ucLookItems1.SetIdOrCode("VEN00063");
+ UcLoading _loading = new UcLoading();
+ string url = "http://localhost:5263/";
+ try
+ {
+ string result = await GetHttpResponseAsync(url);
+ Console.WriteLine(result);
+ richTextBox1.Text = result;
+ }
+ catch (WebException ex)
+ {
+ richTextBox1.Text = ex.Message;
+ }
+ _loading.Stop();
}
- private void simpleButton3_Click(object sender, EventArgs e)
+ private static async Task<string> GetHttpResponseAsync(string url)
{
- ucLookItems1.SetIdOrCode("113223");
+ string param = "{}";
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+
+ request.Method = "POST";
+ request.ContentType = "application/json";
+ //request.Headers.Add("token", GetBasicAuthTicket());
+ request.Accept = "*/*";
+ request.Timeout = 15000;
+ request.AllowAutoRedirect = false;
+
+
+ //StreamWriter requestStream = null;
+ //requestStream = new StreamWriter(request.GetRequestStream());
+ //requestStream.Write(param);
+ //requestStream.Close();
+
+ using (Stream requestStream = await request.GetRequestStreamAsync())
+ {
+ byte[] dataBytes = Encoding.UTF8.GetBytes(param);
+ await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
+ }
+
+
+ using (WebResponse response = await request.GetResponseAsync())
+ using (Stream responseStream = response.GetResponseStream())
+ using (StreamReader reader = new StreamReader(responseStream, Encoding.UTF8))
+ {
+ return await reader.ReadToEndAsync();
+ }
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index cd6b43f..299df99 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -57,6 +57,39 @@
}
}
}
+ /// <summary>
+ /// httpPost璁块棶鏈嶅姟
+ /// </summary>
+ /// <param name="url">鏈嶅姟鍦板潃</param>
+ /// <param name="meth">鏂规硶鍚嶇О</param>
+ /// <param name="param">鍙傛暟</param>
+ /// <returns></returns>
+ public static async Task<string> HttpPostAsync(string url, string meth, string param)
+ {
+ if (string.IsNullOrEmpty(url))
+ url = WebApiUrl;
+ url += meth;
+ var request = (HttpWebRequest)WebRequest.Create(url);
+ request.Method = "POST";
+ request.ContentType = "application/json";
+ request.Headers.Add("token", GetBasicAuthTicket());
+ request.Accept = "*/*";
+ request.Timeout = 15000;
+ request.AllowAutoRedirect = false;
+ using (Stream requestStream = await request.GetRequestStreamAsync())
+ {
+ byte[] dataBytes = Encoding.UTF8.GetBytes(param);
+ await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
+ }
+
+ using (WebResponse response = await request.GetResponseAsync())
+ {
+ using (StreamReader reader = new StreamReader(response.GetResponseStream()))
+ {
+ return await reader.ReadToEndAsync();
+ }
+ }
+ }
/// <summary>
/// httpPost璁块棶鏈嶅姟
@@ -432,7 +465,7 @@
}
if (colType is SimpleButton)
{
- var txt = colType as UcLookCk;
+ var txt = colType as SimpleButton;
txt.Enabled = !isEdt;
continue;
}
@@ -520,6 +553,30 @@
txt.ReadOnly = isEdt;
continue;
}
+
+ //鑷畾涔変粨搴�
+ if (ctrl is UcLookCk)
+ {
+ var txt = ctrl as UcLookCk;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
+ //鑷畾涔変緵搴斿晢
+ if (ctrl is UcLookSupplier)
+ {
+ var txt = ctrl as UcLookSupplier;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
+ if (ctrl is SimpleButton)
+ {
+ var txt = ctrl as SimpleButton;
+ txt.Enabled = !isEdt;
+ continue;
+ }
+
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
index 29d5276..6ac0b50 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
@@ -1,10 +1,14 @@
锘縰sing System.ComponentModel;
+using System.Threading;
using DevExpress.XtraEditors;
+using static DevExpress.XtraPrinting.Native.ExportOptionsPropertiesNames;
namespace Gs.DevApp.UserControl
{
public partial class ShowDialogForm : XtraForm
{
+
+
#region Events
protected override void OnClosing(CancelEventArgs e)
@@ -78,6 +82,7 @@
public ShowDialogForm(string _caption, string _message, string _content)
: this(_caption, _message, _content, 100)
{
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
index d51aeb2..f163c4c 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
@@ -28,20 +28,57 @@
/// </summary>
private void InitializeComponent()
{
- this.progressShow = new DevExpress.XtraEditors.ProgressBarControl();
- this.lblContent = new DevExpress.XtraEditors.LabelControl();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.lblCaption = new DevExpress.XtraEditors.LabelControl();
+ this.lblMessage = new DevExpress.XtraEditors.LabelControl();
+ this.lblContent = new DevExpress.XtraEditors.LabelControl();
+ this.progressShow = new DevExpress.XtraEditors.ProgressBarControl();
this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
this.SuspendLayout();
//
+ // panelControl1
+ //
+ this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D;
+ this.panelControl1.Controls.Add(this.lblCaption);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelControl1.Location = new System.Drawing.Point(0, 0);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(436, 34);
+ this.panelControl1.TabIndex = 0;
+ //
+ // lblCaption
+ //
+ this.lblCaption.Location = new System.Drawing.Point(5, 9);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(41, 14);
+ this.lblCaption.TabIndex = 0;
+ this.lblCaption.Text = "Caption";
+ //
+ // lblMessage
+ //
+ this.lblMessage.Location = new System.Drawing.Point(24, 7);
+ this.lblMessage.Name = "lblMessage";
+ this.lblMessage.Size = new System.Drawing.Size(46, 14);
+ this.lblMessage.TabIndex = 2;
+ this.lblMessage.Text = "Message";
+ //
+ // lblContent
+ //
+ this.lblContent.Location = new System.Drawing.Point(24, 31);
+ this.lblContent.Name = "lblContent";
+ this.lblContent.Size = new System.Drawing.Size(45, 14);
+ this.lblContent.TabIndex = 3;
+ this.lblContent.Text = "Content";
+ //
// progressShow
//
this.progressShow.EditValue = 1;
- this.progressShow.Location = new System.Drawing.Point(24, 94);
- this.progressShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.progressShow.Location = new System.Drawing.Point(24, 59);
this.progressShow.Name = "progressShow";
this.progressShow.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
this.progressShow.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
@@ -53,54 +90,39 @@
this.progressShow.Properties.ShowTitle = true;
this.progressShow.Properties.StartColor = System.Drawing.Color.Empty;
this.progressShow.Properties.Step = 1;
- this.progressShow.Size = new System.Drawing.Size(457, 19);
+ this.progressShow.Size = new System.Drawing.Size(400, 15);
this.progressShow.TabIndex = 4;
- //
- // lblContent
- //
- this.lblContent.Location = new System.Drawing.Point(24, 58);
- this.lblContent.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblContent.Name = "lblContent";
- this.lblContent.Size = new System.Drawing.Size(51, 18);
- this.lblContent.TabIndex = 3;
- this.lblContent.Text = "Content";
- //
- // lblCaption
- //
- this.lblCaption.Location = new System.Drawing.Point(24, 27);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(48, 18);
- this.lblCaption.TabIndex = 0;
- this.lblCaption.Text = "Caption";
//
// panelControl2
//
- this.panelControl2.Controls.Add(this.lblCaption);
+ this.panelControl2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.panelControl2.Controls.Add(this.lblContent);
this.panelControl2.Controls.Add(this.progressShow);
- this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panelControl2.Location = new System.Drawing.Point(0, 0);
- this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.panelControl2.Controls.Add(this.lblMessage);
+ this.panelControl2.Location = new System.Drawing.Point(0, 38);
this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(498, 151);
+ this.panelControl2.Size = new System.Drawing.Size(436, 83);
this.panelControl2.TabIndex = 5;
//
// ShowDialogForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(498, 151);
+ this.ClientSize = new System.Drawing.Size(436, 124);
this.Controls.Add(this.panelControl2);
+ this.Controls.Add(this.panelControl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.IconOptions.ShowIcon = false;
- this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ShowDialogForm";
+ this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShowDialogForm";
- this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.panelControl1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
@@ -111,9 +133,11 @@
#endregion
- private DevExpress.XtraEditors.ProgressBarControl progressShow;
- private DevExpress.XtraEditors.LabelControl lblContent;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.LabelControl lblCaption;
+ private DevExpress.XtraEditors.LabelControl lblMessage;
+ private DevExpress.XtraEditors.LabelControl lblContent;
+ private DevExpress.XtraEditors.ProgressBarControl progressShow;
private DevExpress.XtraEditors.PanelControl panelControl2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs
new file mode 100644
index 0000000..750de3d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs
@@ -0,0 +1,150 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcLoading
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lblCaption = new DevExpress.XtraEditors.LabelControl();
+ this.lblMessage = new DevExpress.XtraEditors.LabelControl();
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.lblContent = new DevExpress.XtraEditors.LabelControl();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.progressShow = new DevExpress.XtraEditors.ProgressBarControl();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lblCaption
+ //
+ this.lblCaption.Location = new System.Drawing.Point(30, 12);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(48, 18);
+ this.lblCaption.TabIndex = 0;
+ this.lblCaption.Text = "Caption";
+ //
+ // lblMessage
+ //
+ this.lblMessage.Location = new System.Drawing.Point(30, 9);
+ this.lblMessage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblMessage.Name = "lblMessage";
+ this.lblMessage.Size = new System.Drawing.Size(58, 18);
+ this.lblMessage.TabIndex = 2;
+ this.lblMessage.Text = "Message";
+ //
+ // panelControl2
+ //
+ this.panelControl2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panelControl2.Controls.Add(this.lblContent);
+ this.panelControl2.Controls.Add(this.progressShow);
+ this.panelControl2.Controls.Add(this.lblMessage);
+ this.panelControl2.Location = new System.Drawing.Point(0, 49);
+ this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(498, 107);
+ this.panelControl2.TabIndex = 5;
+ //
+ // lblContent
+ //
+ this.lblContent.Location = new System.Drawing.Point(30, 40);
+ this.lblContent.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblContent.Name = "lblContent";
+ this.lblContent.Size = new System.Drawing.Size(51, 18);
+ this.lblContent.TabIndex = 3;
+ this.lblContent.Text = "Content";
+ //
+ // panelControl1
+ //
+ this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D;
+ this.panelControl1.Controls.Add(this.lblCaption);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelControl1.Location = new System.Drawing.Point(0, 0);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(498, 44);
+ this.panelControl1.TabIndex = 0;
+ //
+ // progressShow
+ //
+ this.progressShow.EditValue = 1;
+ this.progressShow.Location = new System.Drawing.Point(30, 76);
+ this.progressShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.progressShow.Name = "progressShow";
+ this.progressShow.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
+ this.progressShow.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
+ this.progressShow.Properties.EndColor = System.Drawing.Color.Empty;
+ this.progressShow.Properties.LookAndFeel.SkinName = "Blue";
+ this.progressShow.Properties.LookAndFeel.UseDefaultLookAndFeel = false;
+ this.progressShow.Properties.LookAndFeel.UseWindowsXPTheme = true;
+ this.progressShow.Properties.ReadOnly = true;
+ this.progressShow.Properties.ShowTitle = true;
+ this.progressShow.Properties.StartColor = System.Drawing.Color.Empty;
+ this.progressShow.Properties.Step = 1;
+ this.progressShow.Size = new System.Drawing.Size(457, 19);
+ this.progressShow.TabIndex = 4;
+ //
+ // UcLoading
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(498, 159);
+ this.Controls.Add(this.panelControl2);
+ this.Controls.Add(this.panelControl1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.IconOptions.ShowIcon = false;
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "UcLoading";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "ShowDialogForm";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ this.panelControl2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.panelControl1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ private DevExpress.XtraEditors.LabelControl lblCaption;
+ private DevExpress.XtraEditors.LabelControl lblMessage;
+ private DevExpress.XtraEditors.ProgressBarControl progressShow;
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraEditors.LabelControl lblContent;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.cs b/DevApp/Gs.DevApp/UserControl/UcLoading.cs
new file mode 100644
index 0000000..005dfa4
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLoading.cs
@@ -0,0 +1,71 @@
+锘縰sing DevExpress.Xpo.Logger;
+using DevExpress.XtraEditors;
+using DevExpress.XtraRichEdit.Import.Html;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcLoading : DevExpress.XtraEditors.XtraForm
+ {
+ private Timer timer;
+ private int angle = 0;
+
+ public UcLoading()
+ {
+ InitializeComponent();
+ this.DoubleBuffered = true;
+ timer = new Timer();
+ timer.Interval = 1000 / 60; // 60甯�/绉�
+ timer.Tick += Timer_Tick;
+
+ progressShow.Properties.Minimum = 0;
+ progressShow.Properties.Maximum = 100;
+ progressShow.Properties.Step = 1;
+
+ Show();
+ Start();
+ }
+
+ protected override void OnPaint(PaintEventArgs e)
+ {
+ base.OnPaint(e);
+ DrawLoadingCircle(e.Graphics);
+ }
+
+ private void DrawLoadingCircle(Graphics g)
+ {
+
+ lblCaption.Text = "鍙嬫儏鎻愮ず锛�";
+ lblMessage.Text = "璇风◢鍊欙紝鍔姏涓�......";
+ lblContent.Text = "宸插姞杞� " + progressShow.EditValue.ToString() + "/100";
+
+ progressShow.PerformStep();
+ if (int.Parse(progressShow.EditValue.ToString()) > 95)
+ progressShow.EditValue = 1;
+ }
+
+ private void Timer_Tick(object sender, EventArgs e)
+ {
+ angle = (angle + 30) % 360;
+ this.Invalidate();
+ }
+
+ public void Start()
+ {
+ timer.Start();
+ }
+
+ public void Stop()
+ {
+ timer.Stop();
+ this.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.resx b/DevApp/Gs.DevApp/UserControl/UcLoading.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLoading.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
index 7c0b8b5..79a5162 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -30,9 +30,9 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
@@ -64,6 +64,15 @@
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浠撳簱ID";
+ this.gridColumn1.FieldName = "depotId";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.UnboundDataType = typeof(short);
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "浠撳簱缂栧彿";
@@ -80,15 +89,6 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浠撳簱ID";
- this.gridColumn1.FieldName = "depotId";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.UnboundDataType = typeof(short);
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
//
// gridColumn4
//
--
Gitblit v1.9.3