From e4f8981491b93f64a0b93db07d9b4b2efc04b80c Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 8 May 2024 14:53:55 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EA=B0=80=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EC=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Dev/fDisableItem.cs | 11 +- Project/Dialog/fDashboard.cs | 10 +- Project/Dialog/fDebug.cs | 11 +- Project/Dialog/fErrorException.cs | 7 +- Project/Dialog/fLogin.cs | 6 +- Project/Dialog/fMsgWindow.cs | 7 +- Project/Dialog/fPassword.cs | 10 +- Project/Dialog/fSelectDept.cs | 2 +- Project/Dialog/fTouchKeyFull.cs | 6 +- Project/Properties/AssemblyInfo.cs | 4 +- Project/_Common/fADSUserList.cs | 1 + Project/_Common/fAddNewUser.cs | 6 +- Project/_Common/fNewID.cs | 7 +- Project/_Common/fNewPassword.cs | 6 +- Project/_Common/fUserInfo.cs | 7 +- Project/_Common/fUserList.cs | 1 + Project/_Info/fInfo_Staff.cs | 3 +- Project/_Management/fLineCode.cs | 26 +- Project/fLog.cs | 7 +- Project/fMain.Designer.cs | 116 +--- Project/fMain.cs | 47 +- Project/fMain.resx | 17 +- Project/fSetting.cs | 6 +- .../FBS0000/.vs/FBS0000.csproj.dtbcache.json | 1 + SubProject/FBS0000/Holiday/WorkTable.cs | 3 +- SubProject/FBS0000/Holiday/fErrorChk.cs | 40 +- SubProject/FBS0000/Holiday/fHolyDayData.cs | 10 +- SubProject/FBS0000/Holiday/fHolyDayDataSum.cs | 21 +- SubProject/FBS0000/Holiday/fHolyday.cs | 4 +- .../FBS0000/Holiday/fHolydayJobReport.cs | 4 +- SubProject/FBS0000/Holiday/fHolyday_Add.cs | 2 +- SubProject/FBS0000/Holiday/fImpKunTae.cs | 4 +- SubProject/FBS0000/Holiday/fWorkTableUser.cs | 3 +- SubProject/FBS0000/Holiday/fyeonchastate.cs | 4 +- SubProject/FBS0000/Holiday/rHolidaySummary.cs | 59 +- SubProject/FBS0000/fLovWorkUser.Designer.cs | 1 - SubProject/FBS0000/fLovWorkUser.cs | 13 +- SubProject/FBS0000/fMinutes.cs | 2 + SubProject/FBS0000/fMinutesDetail.cs | 7 +- .../FCM0000/.vs/FCM0000.csproj.dtbcache.json | 1 + SubProject/FCM0000/Board/fPatchList.cs | 10 +- SubProject/FCM0000/Board/fRequestItem.cs | 9 +- SubProject/FCM0000/Board/fRequestItem_Add.cs | 2 + SubProject/FCM0000/Customer_Import.cs | 8 +- SubProject/FCM0000/Form2.cs | 12 +- SubProject/FCM0000/Inventory/RepInvStock.cs | 7 +- SubProject/FCM0000/Inventory/fInventory.cs | 4 +- .../FCM0000/Inventory/fInventoryJagoList.cs | 8 +- .../FCM0000/Inventory/fInventoryJagoPlace.cs | 3 +- .../FCM0000/Inventory/fInventoryUser.cs | 7 +- SubProject/FCM0000/Inventory/finventoryAdd.cs | 8 +- SubProject/FCM0000/Item/fItemAdd.Designer.cs | 1 - SubProject/FCM0000/Item/fItemAdd.cs | 25 +- SubProject/FCM0000/Item/fItemEdit.cs | 9 +- SubProject/FCM0000/Item/fItems.cs | 3 +- SubProject/FCM0000/Item/fLovItem.cs | 9 +- SubProject/FCM0000/Item/fLovOneItem.cs | 7 +- SubProject/FCM0000/Mail/fAutoSendSetting.cs | 8 +- SubProject/FCM0000/Mail/fJRForm.cs | 5 +- SubProject/FCM0000/Mail/fMailAutoAdd.cs | 3 +- SubProject/FCM0000/Mail/fMailBackup.cs | 10 +- SubProject/FCM0000/Mail/fMailList.cs | 9 +- SubProject/FCM0000/Mail/fMailform.cs | 3 +- SubProject/FCM0000/Mail/fSendMail.cs | 2 + SubProject/FCM0000/User/fLovUser.cs | 3 +- SubProject/FCM0000/User/fUserAuth.cs | 3 +- SubProject/FCM0000/User/fUserGroup.cs | 6 +- SubProject/FCM0000/User/fUserGroupDev.cs | 4 +- .../FCM0000/User/fUserGroupPermission.cs | 3 +- SubProject/FCM0000/fCode.cs | 2 + SubProject/FCM0000/fCustoms.cs | 4 +- SubProject/FCM0000/fHolidaytable.cs | 12 +- SubProject/FCM0000/fLovProject.cs | 9 +- SubProject/FCM0000/fLovSupply.cs | 8 +- SubProject/FCM0000/fMaterial_Import.cs | 10 +- SubProject/FCM0000/fSIDListSelect.cs | 4 +- SubProject/FCM0000/fSelectDate.cs | 9 +- SubProject/FCOMMON/fBase.cs | 25 +- SubProject/FCOMMON/fFTPExplorer.cs | 4 +- SubProject/FCOMMON/fFileExplorer.cs | 8 +- SubProject/FCOMMON/fInputTextBox.cs | 9 +- SubProject/FCOMMON/fLovDateList.cs | 5 +- SubProject/FCOMMON/fMagam.cs | 10 +- SubProject/FCOMMON/fProgress.cs | 6 +- SubProject/FCOMMON/fSFI.cs | 5 +- SubProject/FCOMMON/fSelectDay.cs | 6 +- SubProject/FCOMMON/fSelectDays.cs | 6 +- SubProject/FCOMMON/fSelectMonth.cs | 5 +- SubProject/FCOMMON/fSelectProcess.cs | 6 +- SubProject/FED0000/Education/fEdulist.cs | 3 +- SubProject/FED0000/License/fLicenseList.cs | 6 +- .../FEQ0000/.vs/FEQ0000.csproj.dtbcache.json | 1 + SubProject/FEQ0000/Equipment/EQFilterApply.cs | 9 +- .../FEQ0000/Equipment/EQfilterManager.cs | 8 +- SubProject/FEQ0000/Equipment/fEquipment.cs | 6 +- SubProject/FEQ0000/Equipment/fImpEquipment.cs | 16 +- .../FEQ0000/Equipment/rpt_equipmentAll.cs | 9 +- SubProject/FEQ0000/Purchase/fBatchUpdate.cs | 5 +- .../PurchaseCR/fPurchaseCR.Designer.cs | 37 +- SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs | 17 +- .../FEQ0000/PurchaseCR/fPurchaseCR.resx | 2 +- .../FEQ0000/PurchaseCR/fPurchaseCR_Add.cs | 6 +- .../PurchaseCR/fPurchaseCR_ConfRequest.cs | 4 +- .../FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs | 8 +- SubProject/FEQ0000/PurchaseCR/rPurchaseCR.cs | 18 + SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs | 272 +------- .../FEQ0000/PurchaseEB/fPurchaseEBList.cs | 7 +- .../FEQ0000/PurchaseEB/fPurchaseEB_Add.cs | 4 +- .../PurchaseEB/fPurchaseEB_ConfRequest.cs | 2 +- .../FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs | 7 +- SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs | 7 +- SubProject/FEQ0000/PurchaseNR/fInputSC.cs | 10 +- SubProject/FEQ0000/PurchaseNR/fMailForm.cs | 6 +- .../PurchaseNR/fPurchaseNR.Designer.cs | 53 +- SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs | 22 +- .../FEQ0000/PurchaseNR/fPurchaseNR.resx | 2 +- .../FEQ0000/PurchaseNR/fPurchaseNRList.cs | 6 +- .../PurchaseNR/fPurchaseNR_ConfRequest.cs | 2 +- .../FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs | 7 +- .../FEQ0000/PurchaseNR/fPurchase_Add.cs | 3 +- .../FEQ0000/PurchaseNR/fPurchase_AddS.cs | 7 +- .../FEQ0000/PurchaseNR/fPurchase_Data.cs | 10 +- .../FEQ0000/PurchaseNR/fPurchase_Import.cs | 6 +- .../FEQ0000/PurchaseNR/fPurchase_ImportO.cs | 7 +- .../PurchaseNR/fPurchase_excelimport.cs | 3 +- SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs | 6 +- SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs | 3 +- SubProject/FEQ0000/fColumnFilter.cs | 6 +- SubProject/FEQ0000/fItemin.cs | 5 +- SubProject/FEQ0000/fPurchaseConfirm.cs | 2 +- SubProject/FEQ0000/fUserExportColumn.cs | 3 +- .../FPJ0000/.vs/FPJ0000.csproj.dtbcache.json | 1 + SubProject/FPJ0000/DSKuntae.Designer.cs | 141 +++- SubProject/FPJ0000/DSKuntae.xsd | 114 ++-- SubProject/FPJ0000/DSKuntae.xss | 2 +- SubProject/FPJ0000/EBoard/fEBoardImport.cs | 7 +- SubProject/FPJ0000/EBoard/fEBoardReport.cs | 7 +- SubProject/FPJ0000/EBoard/fEboardData.cs | 1 + SubProject/FPJ0000/EBoard/fEboardList.cs | 2 +- SubProject/FPJ0000/FPJ0000.csproj | 9 - SubProject/FPJ0000/Import.cs | 7 +- SubProject/FPJ0000/ImportC.cs | 613 +++++++++--------- SubProject/FPJ0000/JobReport_/K5Dailyform.cs | 4 +- .../FPJ0000/JobReport_/fJobChartMenu.cs | 4 +- SubProject/FPJ0000/JobReport_/fJobReport.cs | 1 + SubProject/FPJ0000/JobReport_/fJobReportAI.cs | 2 +- .../FPJ0000/JobReport_/fJobReportImport.cs | 8 +- .../FPJ0000/JobReport_/fJobReport_Add.cs | 6 +- .../FPJ0000/JobReport_/fJobReport_AddAI.cs | 6 +- SubProject/FPJ0000/JobReport_/fLovProject.cs | 9 +- .../FPJ0000/JobReport_/fProjectConnect.cs | 10 +- .../FPJ0000/JobReport_/fSelectProcess.cs | 7 +- SubProject/FPJ0000/JobReport_/rJobChart.cs | 6 +- SubProject/FPJ0000/JobReport_/rJobReport.cs | 6 +- .../FPJ0000/JobReport_/rJobReportDay.cs | 6 +- SubProject/FPJ0000/JobReport_/rJobReportOT.cs | 10 +- .../FPJ0000/JobReport_/rJobReportPrj.cs | 6 +- .../FPJ0000/JobReport_/rJobReportPrjSche.cs | 6 +- .../FPJ0000/JobReport_/rJobReportType.cs | 6 +- .../FPJ0000/JobReport_/rJobReportUser.cs | 5 +- SubProject/FPJ0000/JobReport_/rK5Dailyform.cs | 6 +- SubProject/FPJ0000/Note/fNote.cs | 2 +- SubProject/FPJ0000/Note/fNote_Add.cs | 6 +- SubProject/FPJ0000/Note/fTextEditor.cs | 7 +- SubProject/FPJ0000/OtConfirm/fHolyRequest.cs | 1 + .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 18 +- SubProject/FPJ0000/OtConfirm/fOTConfirm.cs | 1 + SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs | 6 +- .../FPJ0000/OtConfirm/fOTConfirmValue.cs | 7 +- SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs | 11 +- SubProject/FPJ0000/Project/fLayoutEdit.cs | 7 +- SubProject/FPJ0000/Project/fPartList.cs | 2 +- SubProject/FPJ0000/Project/fProejctHistory.cs | 1 + SubProject/FPJ0000/Project/fProjectData.cs | 2 +- SubProject/FPJ0000/Project/fProjectIOMap.cs | 1 + SubProject/FPJ0000/Project/fProjectLayout.cs | 1 + SubProject/FPJ0000/Project/fProjectList.cs | 2 +- SubProject/FPJ0000/Project/fProjectListU.cs | 1 + .../FPJ0000/Project/fProjectListUser.cs | 2 +- .../FPJ0000/Project/fProjectListUserDetail.cs | 4 +- .../FPJ0000/Project/fProjectPartImport.cs | 8 +- .../FPJ0000/Project/fProjectPartListEdit.cs | 2 +- .../Project/fProjectPartToPurchaseCR.cs | 7 +- .../FPJ0000/Project/fProjectSchedule.cs | 2 +- SubProject/FPJ0000/Project/fProjectSummary.cs | 1 + SubProject/FPJ0000/Project/fSCCheck.cs | 7 +- .../FPJ0000/Project/fSPMaster.Designer.cs | 515 --------------- SubProject/FPJ0000/Project/fSPMaster.cs | 178 ----- SubProject/FPJ0000/Project/fSPMaster.resx | 224 ------- SubProject/FPJ0000/Project/rPartList.cs | 6 +- SubProject/FPJ0000/SaveCost/fSaveCostData.cs | 1 + SubProject/FPJ0000/SaveCost/fSaveCostList.cs | 1 + .../FPJ0000/SaveCost/fSaveCostReport.cs | 6 +- SubProject/FPJ0000/fHistAdd.cs | 6 +- SubProject/FPJ0000/fHistAddDay.cs | 20 +- SubProject/FPJ0000/fMailList.cs | 39 +- SubProject/FPJ0000/fMailSend.cs | 1 + SubProject/FPM0000/FPM0000.csproj | 9 - SubProject/FPM0000/fSPMaster.Designer.cs | 569 ---------------- SubProject/FPM0000/fSPMaster.cs | 182 ------ SubProject/FPM0000/fSPMaster.resx | 220 ------- 201 files changed, 1355 insertions(+), 3219 deletions(-) create mode 100644 SubProject/FBS0000/.vs/FBS0000.csproj.dtbcache.json create mode 100644 SubProject/FCM0000/.vs/FCM0000.csproj.dtbcache.json create mode 100644 SubProject/FEQ0000/.vs/FEQ0000.csproj.dtbcache.json create mode 100644 SubProject/FPJ0000/.vs/FPJ0000.csproj.dtbcache.json delete mode 100644 SubProject/FPJ0000/Project/fSPMaster.Designer.cs delete mode 100644 SubProject/FPJ0000/Project/fSPMaster.cs delete mode 100644 SubProject/FPJ0000/Project/fSPMaster.resx delete mode 100644 SubProject/FPM0000/fSPMaster.Designer.cs delete mode 100644 SubProject/FPM0000/fSPMaster.cs delete mode 100644 SubProject/FPM0000/fSPMaster.resx diff --git a/Project/Dev/fDisableItem.cs b/Project/Dev/fDisableItem.cs index b59a3bc..678a4e5 100644 --- a/Project/Dev/fDisableItem.cs +++ b/Project/Dev/fDisableItem.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,13 +11,17 @@ using System.Windows.Forms; namespace Project.Dev { - public partial class fDisableItem : Form + public partial class fDisableItem : fBase { public fDisableItem() { InitializeComponent(); } - + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void button1_Click(object sender, EventArgs e) { diff --git a/Project/Dialog/fDashboard.cs b/Project/Dialog/fDashboard.cs index 82968c1..eef98ad 100644 --- a/Project/Dialog/fDashboard.cs +++ b/Project/Dialog/fDashboard.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,13 +11,18 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fDashboard : Form + public partial class fDashboard : fBase { public fDashboard() { InitializeComponent(); } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void label1_Click(object sender, EventArgs e) { diff --git a/Project/Dialog/fDebug.cs b/Project/Dialog/fDebug.cs index 8f079f1..ba07238 100644 --- a/Project/Dialog/fDebug.cs +++ b/Project/Dialog/fDebug.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fDebug : Form + public partial class fDebug : fBase { public fDebug() { @@ -17,7 +18,11 @@ namespace Project.Dialog this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); }; } - + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void button1_Click(object sender, EventArgs e) { Pub.barcode.RaiseRecvData("RECV BCD"); diff --git a/Project/Dialog/fErrorException.cs b/Project/Dialog/fErrorException.cs index 19764f9..81f0e94 100644 --- a/Project/Dialog/fErrorException.cs +++ b/Project/Dialog/fErrorException.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project { - public partial class fErrorException : Form + public partial class fErrorException : fBase { public fErrorException(string err) { @@ -28,7 +29,7 @@ namespace Project private void fErrorException_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } private void button2_Click(object sender, EventArgs e) diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 1a931b1..5814fe8 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -11,7 +12,7 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fLogin : Form + public partial class fLogin : fBase { public fLogin() { @@ -27,6 +28,7 @@ namespace Project.Dialog } private void fLogin_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var list = Pub.setting.lastid.Split(';'); foreach (var item in list) if (item != "") tbID.Items.Add(item); diff --git a/Project/Dialog/fMsgWindow.cs b/Project/Dialog/fMsgWindow.cs index ae5a03f..29eb15f 100644 --- a/Project/Dialog/fMsgWindow.cs +++ b/Project/Dialog/fMsgWindow.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fMsgWindow : Form + public partial class fMsgWindow : fBase { private Boolean fMove = false; private Point MDownPos; @@ -48,7 +49,7 @@ namespace Project.Dialog private void fMsg_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } public void SetText(string m) diff --git a/Project/Dialog/fPassword.cs b/Project/Dialog/fPassword.cs index 33eb712..c2ed060 100644 --- a/Project/Dialog/fPassword.cs +++ b/Project/Dialog/fPassword.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fPassword : Form + public partial class fPassword : fBase { public fPassword() { @@ -20,6 +21,11 @@ namespace Project.Dialog if (e1.KeyCode == Keys.Escape) this.Close(); }; } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void button1_Click(object sender, EventArgs e) { diff --git a/Project/Dialog/fSelectDept.cs b/Project/Dialog/fSelectDept.cs index e1b8f07..1eceb69 100644 --- a/Project/Dialog/fSelectDept.cs +++ b/Project/Dialog/fSelectDept.cs @@ -23,7 +23,7 @@ namespace Project.Dialog private void fSelectDept_Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsMSSQL.UserGroup' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. + EnsureVisibleAndUsableSize(); this.ta.Fill(this.dsMSSQL.UserGroup); var ta = new dsMSSQLTableAdapters.UserGroupTableAdapter(); diff --git a/Project/Dialog/fTouchKeyFull.cs b/Project/Dialog/fTouchKeyFull.cs index 91c4e12..404066e 100644 --- a/Project/Dialog/fTouchKeyFull.cs +++ b/Project/Dialog/fTouchKeyFull.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fTouchKeyFull : Form + public partial class fTouchKeyFull : fBase { public fTouchKeyFull(string title,string value) { @@ -28,6 +29,7 @@ namespace Project.Dialog private void fTouchKeyFull_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); this.tbInput.SelectAll(); diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index e6af9cf..a12e500 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.03.03.1500")] -[assembly: AssemblyFileVersion("24.03.03.1500")] +[assembly: AssemblyVersion("24.05.08.1450")] +[assembly: AssemblyFileVersion("24.05.08.1450")] diff --git a/Project/_Common/fADSUserList.cs b/Project/_Common/fADSUserList.cs index d29b36f..e739c00 100644 --- a/Project/_Common/fADSUserList.cs +++ b/Project/_Common/fADSUserList.cs @@ -25,6 +25,7 @@ namespace Project._Common private void fADSUserList_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.lbDomain.Text = this.DomainName(); this.btInsert.Visible = (FCOMMON.info.Login.level > 9); this.tbEntry.Text = "LDAP://OU=Office,OU=Users,OU=People,OU=K4,DC=kr,DC=ds,DC=amkor,DC=com"; diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs index 06a9816..e7671e5 100644 --- a/Project/_Common/fAddNewUser.cs +++ b/Project/_Common/fAddNewUser.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project._Common { - public partial class fAddNewUser : Form // FCOMMON.fBase + public partial class fAddNewUser : fBase // FCOMMON.fBase { string p_dept = string.Empty; string p_id = string.Empty; @@ -74,6 +75,7 @@ namespace Project._Common private void fUserInfo_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); if (this.deflevel < 1) diff --git a/Project/_Common/fNewID.cs b/Project/_Common/fNewID.cs index 31d56fb..995e478 100644 --- a/Project/_Common/fNewID.cs +++ b/Project/_Common/fNewID.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project._Common { - public partial class fNewID : Form + public partial class fNewID : fBase { public fNewID(string userid) { @@ -19,7 +20,7 @@ namespace Project._Common private void fNewPassword_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } private void button1_Click(object sender, EventArgs e) diff --git a/Project/_Common/fNewPassword.cs b/Project/_Common/fNewPassword.cs index 43596a5..6ffa0de 100644 --- a/Project/_Common/fNewPassword.cs +++ b/Project/_Common/fNewPassword.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project._Common { - public partial class fNewPassword : Form + public partial class fNewPassword : fBase { public string newpassword { get; set; } public fNewPassword(string userid) @@ -20,6 +21,7 @@ namespace Project._Common private void fNewPassword_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.account)); if (curLevel >= 5) diff --git a/Project/_Common/fUserInfo.cs b/Project/_Common/fUserInfo.cs index 298de3d..e751bff 100644 --- a/Project/_Common/fUserInfo.cs +++ b/Project/_Common/fUserInfo.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project._Common { - public partial class fUserInfo : Form // FCOMMON.fBase + public partial class fUserInfo : fBase { public fUserInfo() { @@ -20,7 +21,7 @@ namespace Project._Common private void fUserInfo_Load(object sender, EventArgs e) { - // + EnsureVisibleAndUsableSize(); this.ta.FillID(this.dsMSSQL.Users,FCOMMON.info.Login.no); dr = this.dsMSSQL.Users.Rows[0] as dsMSSQL.UsersRow; tbKJPath.Text = FCOMMON.DBM.getPathKJ(FCOMMON.info.Login.dept); diff --git a/Project/_Common/fUserList.cs b/Project/_Common/fUserList.cs index 1ae83e3..ec5947d 100644 --- a/Project/_Common/fUserList.cs +++ b/Project/_Common/fUserList.cs @@ -71,6 +71,7 @@ namespace Project._Common private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var form = this as Form; Pub.SetFormStatus(ref form, this.Name, true); this.Show(); diff --git a/Project/_Info/fInfo_Staff.cs b/Project/_Info/fInfo_Staff.cs index 177b2d8..fac04cf 100644 --- a/Project/_Info/fInfo_Staff.cs +++ b/Project/_Info/fInfo_Staff.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace Project._Info { - public partial class fInfo_Staff : Form + public partial class fInfo_Staff : FCOMMON.fBase { public fInfo_Staff() { @@ -24,6 +24,7 @@ namespace Project._Info private void fInfo_Staff_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var Item = this.grid1.Items; Item.Clear(); Item.Add(new StaffLayoutCtl.grid.CItem(r: 1, c: 1, rs: 2, cs: 2, text: "김치균", bg: Color.White.ToArgb())); diff --git a/Project/_Management/fLineCode.cs b/Project/_Management/fLineCode.cs index 20b2786..7cb27af 100644 --- a/Project/_Management/fLineCode.cs +++ b/Project/_Management/fLineCode.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project._Management { - public partial class fLineCode : Form + public partial class fLineCode : fBase { public fLineCode() { @@ -22,17 +23,9 @@ namespace Project._Management var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, false); } - - private void lineCodeBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - this.Validate(); - this.bs.EndEdit(); - this.tam.UpdateAll(this.dsMSSQL); - - } - - private void fLineCode_Load(object sender, EventArgs e) + private void fLineCode_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); this.Show(); @@ -45,6 +38,15 @@ namespace Project._Management } + private void lineCodeBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + this.tam.UpdateAll(this.dsMSSQL); + + } + + void LineCode_TableNewRow(object sender, DataTableNewRowEventArgs e) { diff --git a/Project/fLog.cs b/Project/fLog.cs index 52d5130..41c1602 100644 --- a/Project/fLog.cs +++ b/Project/fLog.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project { - public partial class fLog : Form + public partial class fLog : fBase { public fLog() { @@ -29,7 +30,7 @@ namespace Project private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index f0a8088..04a1a9a 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -82,12 +82,6 @@ this.mn_jago = new System.Windows.Forms.ToolStripMenuItem(); this.관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.재고현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pMP현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_eq = new System.Windows.Forms.ToolStripMenuItem(); - this.aLLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.프로그램사용관련알림ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.휴가관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.휴일연장근무승인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.휴일연장근무집계표출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -137,9 +131,7 @@ this.그룹정보ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.accessDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.메일자동발신테스트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.아이템비활성화하기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -384,7 +376,6 @@ this.비용절감ToolStripMenuItem, this.라이선스ToolStripMenuItem, this.mn_jago, - this.mn_eq, this.휴가관리ToolStripMenuItem, this.personalInventoryToolStripMenuItem}); this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image"))); @@ -568,8 +559,7 @@ // this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.관리ToolStripMenuItem, - this.재고현황ToolStripMenuItem, - this.pMP현황ToolStripMenuItem}); + this.재고현황ToolStripMenuItem}); this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image"))); this.mn_jago.Name = "mn_jago"; this.mn_jago.Size = new System.Drawing.Size(203, 24); @@ -589,57 +579,6 @@ this.재고현황ToolStripMenuItem.Text = "재고 현황"; this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click); // - // pMP현황ToolStripMenuItem - // - this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem"; - this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); - this.pMP현황ToolStripMenuItem.Text = "PMP 현황"; - this.pMP현황ToolStripMenuItem.Visible = false; - this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click); - // - // mn_eq - // - this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.aLLToolStripMenuItem, - this.toolStripMenuItem2, - this.라인코드관리ToolStripMenuItem, - this.프로그램사용관련알림ToolStripMenuItem}); - this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image"))); - this.mn_eq.Name = "mn_eq"; - this.mn_eq.Size = new System.Drawing.Size(203, 24); - this.mn_eq.Text = "장비 목록"; - // - // aLLToolStripMenuItem - // - this.aLLToolStripMenuItem.Enabled = false; - this.aLLToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.aLLToolStripMenuItem.Name = "aLLToolStripMenuItem"; - this.aLLToolStripMenuItem.Size = new System.Drawing.Size(233, 24); - this.aLLToolStripMenuItem.Text = "데이터 및 레포트"; - this.aLLToolStripMenuItem.Click += new System.EventHandler(this.aLLToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(230, 6); - // - // 라인코드관리ToolStripMenuItem - // - this.라인코드관리ToolStripMenuItem.Enabled = false; - this.라인코드관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem"; - this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(233, 24); - this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; - this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); - // - // 프로그램사용관련알림ToolStripMenuItem - // - this.프로그램사용관련알림ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem"; - this.프로그램사용관련알림ToolStripMenuItem.Size = new System.Drawing.Size(233, 24); - this.프로그램사용관련알림ToolStripMenuItem.Text = "프로그램 사용 관련 알림"; - this.프로그램사용관련알림ToolStripMenuItem.Click += new System.EventHandler(this.프로그램사용관련알림ToolStripMenuItem_Click); - // // 휴가관리ToolStripMenuItem // this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -663,7 +602,6 @@ this.휴가관리ToolStripMenuItem.Name = "휴가관리ToolStripMenuItem"; this.휴가관리ToolStripMenuItem.Size = new System.Drawing.Size(203, 24); this.휴가관리ToolStripMenuItem.Text = "근태관리"; - this.휴가관리ToolStripMenuItem.Click += new System.EventHandler(this.휴가관리ToolStripMenuItem_Click); // // 휴일연장근무승인ToolStripMenuItem // @@ -799,39 +737,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -840,7 +778,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -849,7 +787,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -857,7 +795,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -865,7 +803,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -874,7 +812,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -927,9 +865,7 @@ this.그룹정보ToolStripMenuItem1, this.toolStripMenuItem1, this.임의테이블조작ToolStripMenuItem, - this.pMP데이터베이스업데이트ToolStripMenuItem, this.mailBackupToolStripMenuItem, - this.accessDBToolStripMenuItem, this.메일자동발신테스트ToolStripMenuItem, this.toolStripMenuItem5, this.아이템비활성화하기ToolStripMenuItem, @@ -1051,15 +987,6 @@ this.임의테이블조작ToolStripMenuItem.Text = "구매내역 suuply 다시 설정 하기"; this.임의테이블조작ToolStripMenuItem.Click += new System.EventHandler(this.임의테이블조작ToolStripMenuItem_Click); // - // pMP데이터베이스업데이트ToolStripMenuItem - // - this.pMP데이터베이스업데이트ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.pMP데이터베이스업데이트ToolStripMenuItem.Name = "pMP데이터베이스업데이트ToolStripMenuItem"; - this.pMP데이터베이스업데이트ToolStripMenuItem.Size = new System.Drawing.Size(302, 24); - this.pMP데이터베이스업데이트ToolStripMenuItem.Text = "PMP 데이터베이스 업데이트"; - this.pMP데이터베이스업데이트ToolStripMenuItem.Visible = false; - this.pMP데이터베이스업데이트ToolStripMenuItem.Click += new System.EventHandler(this.pMP데이터베이스업데이트ToolStripMenuItem_Click); - // // mailBackupToolStripMenuItem // this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem"; @@ -1067,13 +994,6 @@ this.mailBackupToolStripMenuItem.Text = "Mail Backup"; this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click); // - // accessDBToolStripMenuItem - // - this.accessDBToolStripMenuItem.Name = "accessDBToolStripMenuItem"; - this.accessDBToolStripMenuItem.Size = new System.Drawing.Size(302, 24); - this.accessDBToolStripMenuItem.Text = "Access DB"; - this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click); - // // 메일자동발신테스트ToolStripMenuItem // this.메일자동발신테스트ToolStripMenuItem.Name = "메일자동발신테스트ToolStripMenuItem"; @@ -1151,7 +1071,6 @@ this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); - this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // // toolStrip1 // @@ -1224,7 +1143,6 @@ this.toolStripButton1.Text = "구매진행상황"; this.toolStripButton1.ToolTipText = "구매진행상황"; this.toolStripButton1.Visible = false; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2); // // toolStripButton2 // @@ -1258,11 +1176,9 @@ this.Controls.Add(this.statusStrip1); this.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.Name = "fMain"; this.Padding = new System.Windows.Forms.Padding(1, 1, 1, 3); - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = " "; this.Load += new System.EventHandler(this.@__Load); this.cmTab.ResumeLayout(false); @@ -1298,7 +1214,6 @@ private System.Windows.Forms.ToolStripMenuItem bugReportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem todoListToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem managementToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem mn_eq; private System.Windows.Forms.ToolStripMenuItem personalInventoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem; @@ -1312,8 +1227,6 @@ private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem; private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; - private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mn_project; @@ -1338,8 +1251,6 @@ private System.Windows.Forms.ToolStripMenuItem 메일양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메일내역ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; - private System.Windows.Forms.ToolStripMenuItem pMP데이터베이스업데이트ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem pMP현황ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메모장ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; @@ -1360,8 +1271,6 @@ private System.Windows.Forms.ToolStripMenuItem 업무현황전자실ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 기타ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 품목검색ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem accessDBToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem aLLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem layoutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 교육목록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 양식ToolStripMenuItem; @@ -1387,7 +1296,6 @@ private System.Windows.Forms.ToolStripMenuItem 프로젝트스케쥴담당자사번업데이트ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12; private System.Windows.Forms.ToolStripMenuItem 그룹정보ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 프로그램사용관련알림ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 일반구매ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cR구매ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem sPR구매ToolStripMenuItem; diff --git a/Project/fMain.cs b/Project/fMain.cs index 8fdda74..bc5612f 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -14,7 +14,7 @@ using FBS0000; namespace Project { - public partial class fMain : Form + public partial class fMain : fBase { string SearchKey = string.Empty; ServiceHost host; @@ -109,6 +109,7 @@ namespace Project private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Text = Application.ProductName + " v" + Application.ProductVersion; Pub.init(); @@ -212,7 +213,7 @@ namespace Project this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project); this.mn_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history); this.mn_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago); - this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment); + //this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment); this.mn_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday); this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu); //this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); @@ -932,13 +933,6 @@ namespace Project { } - private void pMP현황ToolStripMenuItem_Click(object sender, EventArgs e) - { - string formkey = "PMPDB"; - if (!ShowForm(formkey)) - AddForm(formkey, new FPM0000.fSPMaster()); - - } private void mailBackupToolStripMenuItem_Click(object sender, EventArgs e) { @@ -968,17 +962,7 @@ namespace Project menu_work_report(); } - private void toolStripButton4_Click_1(object sender, EventArgs e) - { - string formkey = "PMPDB"; - if (!ShowForm(formkey)) - AddForm(formkey, new FPM0000.fSPMaster()); - } - - private void 휴가관리ToolStripMenuItem_Click(object sender, EventArgs e) - { - - } + private void 근태입력ToolStripMenuItem_Click(object sender, EventArgs e) { @@ -1002,10 +986,7 @@ namespace Project menu_projecT_list(); } - private void toolStripButton1_Click_2(object sender, EventArgs e) - { - // menu_projectPartStatus_list(); - } + private void toolStripButton2_Click_1(object sender, EventArgs e) { @@ -1041,19 +1022,7 @@ namespace Project //f.Show(); } - private void accessDBToolStripMenuItem_Click(object sender, EventArgs e) - { - - } - - - private void aLLToolStripMenuItem_Click(object sender, EventArgs e) - { - string formkey = "EQALL"; - if (!ShowForm(formkey)) - AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.ALL), "ALL"); - } - + private void layoutToolStripMenuItem_Click(object sender, EventArgs e) { string formkey = "PLYOU"; @@ -1088,10 +1057,6 @@ namespace Project AddForm(formkey, new FED0000.fLicenseList()); } - private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) - { - - } private void 휴일연장근무승인ToolStripMenuItem_Click(object sender, EventArgs e) { diff --git a/Project/fMain.resx b/Project/fMain.resx index e68815b..3f09c82 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -252,17 +252,6 @@ 8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R v3gHemD5QK4HtBMSEyRplOTBgAA7 - - - - - R0lGODlhEAAQAIUkAHBwcMXFxaioqJqamtHR0XNzc6SkpJeXl6CgoNXV1ZiYmHd3d8fHx6Kioo2NjZub - m6GhoX9/f4qKipSUlKenp5CQkJOTk6Ojo3t7e6WlpZ2dnX19fZ+fn4SEhHJycn5+foWFhZ6entra2v// - /////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAkACwAAAAAEAAQ - AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v - LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL - hQnTql2rNiAAOw== @@ -468,14 +457,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UTMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /U7m/E+5XP8/92TF/3lzYj/UTMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3t9r/vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP7VafX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQB1R6qRWIAd8wAAAABJRU5ErkJggg== + 2d+jAdUG1LhtIjtQcP6VqfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQBvTaqMgm6frAAAAABJRU5ErkJggg== diff --git a/Project/fSetting.cs b/Project/fSetting.cs index e794dd7..b458cb1 100644 --- a/Project/fSetting.cs +++ b/Project/fSetting.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace Project { - public partial class fSetting : Form + public partial class fSetting : fBase { @@ -33,6 +34,7 @@ namespace Project private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.propertyGrid1.SelectedObject = Pub.setting; this.propertyGrid1.Refresh(); diff --git a/SubProject/FBS0000/.vs/FBS0000.csproj.dtbcache.json b/SubProject/FBS0000/.vs/FBS0000.csproj.dtbcache.json new file mode 100644 index 0000000..42e9d39 --- /dev/null +++ b/SubProject/FBS0000/.vs/FBS0000.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FBS0000","ProjectFileName":"FBS0000.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"dsMSSQL.cs"},{"SourceFile":"dsMSSQL.Designer.cs"},{"SourceFile":"dsReport.cs"},{"SourceFile":"dsReport.Designer.cs"},{"SourceFile":"EETGW_HolydayRequest.cs"},{"SourceFile":"fLovWorkUser.cs"},{"SourceFile":"fLovWorkUser.Designer.cs"},{"SourceFile":"Holiday\\fErrorChk.cs"},{"SourceFile":"Holiday\\fErrorChk.Designer.cs"},{"SourceFile":"Holiday\\fyeonchastate.cs"},{"SourceFile":"Holiday\\fyeonchastate.Designer.cs"},{"SourceFile":"Holiday\\fHolyDayDataSum.cs"},{"SourceFile":"Holiday\\fHolyDayDataSum.Designer.cs"},{"SourceFile":"Holiday\\fImpKunTae.cs"},{"SourceFile":"Holiday\\fImpKunTae.Designer.cs"},{"SourceFile":"Holiday\\fWorkTableUser.cs"},{"SourceFile":"Holiday\\fWorkTableUser.Designer.cs"},{"SourceFile":"Holiday\\fHolyDayData.cs"},{"SourceFile":"Holiday\\fHolyDayData.Designer.cs"},{"SourceFile":"Holiday\\WorkTable.cs"},{"SourceFile":"Holiday\\WorkTable.Designer.cs"},{"SourceFile":"Holiday\\fHolydayJobReport.cs"},{"SourceFile":"Holiday\\fHolydayJobReport.Designer.cs"},{"SourceFile":"Holiday\\fHolyday.cs"},{"SourceFile":"Holiday\\fHolyday.Designer.cs"},{"SourceFile":"fMinutes.cs"},{"SourceFile":"fMinutes.Designer.cs"},{"SourceFile":"fMinutesDetail.cs"},{"SourceFile":"fMinutesDetail.Designer.cs"},{"SourceFile":"Holiday\\fHolyday_Add.cs"},{"SourceFile":"Holiday\\fHolyday_Add.Designer.cs"},{"SourceFile":"Holyday.cs"},{"SourceFile":"JobReport.cs"},{"SourceFile":"Model_BS0000.Context.cs"},{"SourceFile":"Model_BS0000.cs"},{"SourceFile":"Model_BS0000.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Holiday\\rHolidaySummary.cs"},{"SourceFile":"Holiday\\rHolidaySummary.Designer.cs"},{"SourceFile":"Users.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\arCtl\\bin\\debug\\arControl.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\ArSetting.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FBS0000\\bin\\Debug\\CarlosAg.ExcelXmlWriter.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\EntityFramework.6.2.0\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\EntityFramework.6.2.0\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Excel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Localization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PDF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PluginCalendar.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Chart.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Spread.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000\\bin\\debug\\FCM0000.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCOMMON\\bin\\Debug\\FCOMMON.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Win.PluginInputMan.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\libxl.net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\NetOffice.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\OfficeApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Outlook.1.8.1\\lib\\net40\\OutlookApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\VBIDEApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FBS0000\\bin\\Debug\\FBS0000.exe","OutputItemRelativePath":"FBS0000.exe"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FBS0000\\bin\\Debug\\FBS0000.pdb","OutputItemRelativePath":"FBS0000.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index fa98930..5f70d4c 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -27,10 +27,11 @@ namespace FBS0000 tbGrp.Text = string.Empty; //this.dv1.CellFormatting += dv1_CellFormatting; } + private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); if (curLevel >= 5) diff --git a/SubProject/FBS0000/Holiday/fErrorChk.cs b/SubProject/FBS0000/Holiday/fErrorChk.cs index b8ea24a..56ebf70 100644 --- a/SubProject/FBS0000/Holiday/fErrorChk.cs +++ b/SubProject/FBS0000/Holiday/fErrorChk.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FBS0000.Holiday { - public partial class fErrorChk : Form + public partial class fErrorChk : fBase { public fErrorChk() { @@ -23,43 +24,12 @@ namespace FBS0000.Holiday private void fErrorChk_Load(object sender, EventArgs e) { //기본 이번달 설정한다 + EnsureVisibleAndUsableSize(); button2.PerformClick(); } - //void dtSD_KeyDown(object sender, KeyEventArgs e) - //{ - // if (e.KeyCode != Keys.Enter) return; - // var tb = sender as TextBox; - // var input = tb.Text.Trim(); - // if (input == "") tb.Text = DateTime.Now.ToShortDateString(); - // else - // { - // string dt = string.Empty; - // if (!FCOMMON.Util.MakeDateString(input, out dt)) - // { - // FCOMMON.Util.MsgE("입력값이 올바르지 않습니다."); - // tb.SelectAll(); - // tb.Focus(); - // return; - // } - // else - // { - // tb.Text = dt; - // } - // } - // if (tb == dtSD) - // { - // dtED.Focus(); - // dtED.SelectAll(); - // } - // else - // { - // // btSearch.PerformClick(); - // tb.SelectAll(); - // } - //} - private void listView1_SelectedIndexChanged(object sender, EventArgs e) + private void listView1_SelectedIndexChanged(object sender, EventArgs e) { } diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.cs b/SubProject/FBS0000/Holiday/fHolyDayData.cs index b6a0517..4956992 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FBS0000 { - public partial class fHolyDayData : Form + public partial class fHolyDayData : fBase { bool binit = false; public fHolyDayData(string sdate, string uid) @@ -36,11 +37,14 @@ namespace FBS0000 } private void rJobReport_Load(object sender, EventArgs e) - { + { + EnsureVisibleAndUsableSize(); refreshData(); binit = true; } + + string GetUIDValue() { string uid = "%"; diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs index 9c81e20..32a5920 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs @@ -36,11 +36,30 @@ namespace FBS0000 } private void rJobReport_Load(object sender, EventArgs e) - { + { + EnsureVisibleAndUsableSize(); refreshData(); binit = true; } + private void EnsureVisibleAndUsableSize() + { + var visibleBounds = Screen.GetWorkingArea(this); + var isOutOfView = (Left > visibleBounds.Right) || (Top > visibleBounds.Bottom) || + (Right < visibleBounds.Left) || (Bottom < visibleBounds.Top); + if (isOutOfView) + { + CenterToScreen(); + } + var minW = Math.Max(320, this.MinimumSize.Width); + var minH = Math.Max(240, this.MinimumSize.Height); + + if (Width < minW || Height < minH) + { + this.Size = new Size(minW, minH); + } + } + //string GetUIDValue() //{ // string uid = "%"; diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 80526af..ab33365 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -32,9 +32,11 @@ namespace FBS0000 //if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; //else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; } + - private void __Load(object sender, EventArgs e) + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); //엔터키누르면 아래로 이동하게함ㄷ FarPoint.Win.Spread.InputMap im = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenFocused); diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs index 490bce5..4838dd1 100644 --- a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs +++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs @@ -23,10 +23,10 @@ namespace FBS0000 this.tbED.Text = ed; p_uid = uid; } - + private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //udpate user list var userList = FCOMMON.DBM.getUserList(); this.cmbUser.Items.Clear(); diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index ada349f..79da78a 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -56,9 +56,9 @@ namespace FBS0000 } - private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); cmbUser.SelectedValue = dr.uid;// FCOMMON.info.Login.no;// .Text = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")"; dateTimePicker1.Value = dr.sdate; dateTimePicker2.Value = dr.edate; diff --git a/SubProject/FBS0000/Holiday/fImpKunTae.cs b/SubProject/FBS0000/Holiday/fImpKunTae.cs index e206b66..3d4548c 100644 --- a/SubProject/FBS0000/Holiday/fImpKunTae.cs +++ b/SubProject/FBS0000/Holiday/fImpKunTae.cs @@ -20,9 +20,9 @@ namespace FBS0000.Holiday private void fImpKunTae_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } - + private void button2_Click(object sender, EventArgs e) { if (Clipboard.ContainsText() == false) diff --git a/SubProject/FBS0000/Holiday/fWorkTableUser.cs b/SubProject/FBS0000/Holiday/fWorkTableUser.cs index 0567415..6e0799d 100644 --- a/SubProject/FBS0000/Holiday/fWorkTableUser.cs +++ b/SubProject/FBS0000/Holiday/fWorkTableUser.cs @@ -36,6 +36,7 @@ namespace FBS0000 } private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); UpdateGrpList(); if (cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0; //일반사용자의경우에는 상태를 변경하지 못한다. @@ -51,7 +52,7 @@ namespace FBS0000 RefreshData(); } - + void Holyday_TableNewRow(object sender, DataTableNewRowEventArgs e) { e.Row["gcode"] = FCOMMON.info.Login.gcode; diff --git a/SubProject/FBS0000/Holiday/fyeonchastate.cs b/SubProject/FBS0000/Holiday/fyeonchastate.cs index 6867e7f..24b16e8 100644 --- a/SubProject/FBS0000/Holiday/fyeonchastate.cs +++ b/SubProject/FBS0000/Holiday/fyeonchastate.cs @@ -32,9 +32,11 @@ namespace FBS0000 //if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; //else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; } + - private void __Load(object sender, EventArgs e) + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); //엔터키누르면 아래로 이동하게함ㄷ FarPoint.Win.Spread.InputMap im = this.fpSpread1.GetInputMap(FarPoint.Win.Spread.InputMapMode.WhenFocused); diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.cs index 5aeaba8..4bcd152 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.cs +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.cs @@ -2,6 +2,7 @@ using FarPoint.Excel.EntityClassLibrary.DrawingVML; using FarPoint.Win.Spread; using FarPoint.Win.Spread.CellType.BarCode; +using FCOMMON; using NetOffice.Extensions.Invoker; using System; using System.Collections.Generic; @@ -14,7 +15,7 @@ using System.Windows.Forms; namespace FBS0000 { - public partial class rHolidaySummary : Form + public partial class rHolidaySummary : fBase { public rHolidaySummary() { @@ -25,17 +26,7 @@ namespace FBS0000 private void rJobReport_Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsReport.holydata' 테이블에 로드합니다. 필요 시 이 코드를 이동하거나 제거할 수 있습니다. - //this.ta.Fill(this.dsReport.holydata); - //this.tbProcess.Items.Clear(); - //tbProcess.Items.Add("전체"); - //var taProcess = new dsReportTableAdapters.holydataTableAdapter(); - //var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); - //foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) - // tbProcess.Items.Add(dr.processs); - - //this.tbProcess.Text = FCOMMON.info.Login.process; - //if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; + EnsureVisibleAndUsableSize(); this.tbMon.Text = DateTime.Now.ToShortDateString(); @@ -310,22 +301,54 @@ namespace FBS0000 for (int i = 0; i < fpSpread1_Sheet1.RowCount; i++) fpSpread1_Sheet1.Cells[i, 0].BackColor = Color.White; - - for (int i = 4; i <= grpend2; i++) { var colname = fpSpread1_Sheet1.Columns[i - 1].Label; var cellf = fpSpread1_Sheet1.Cells.Get(row, i - 1).CellType; - - if (colname.Contains("%") == false) + if (colname.Contains("%") == false) //일반 컬럼은 합계를 ㅏㅎㄴ다 { fpSpread1_Sheet1.SetFormula(row, i - 1, $"SUM(R1C{i}:R{row}C{i})"); } else { - fpSpread1_Sheet1.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})"); - fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1; + var startindex = colname.StartsWith("소진율") ? 2 : 3; + //이월 + var o이월 = fpSpread1_Sheet1.Cells[row, i - (startindex + 4)].Value; + //발생 + var o발생 = fpSpread1_Sheet1.Cells[row, i - (startindex + 3)].Value; + //사용 + var o사용 = fpSpread1_Sheet1.Cells[row, i - (startindex + 2)].Value; + //잔여 + var o잔여 = fpSpread1_Sheet1.Cells[row, i - (startindex + 1)].Value; + //초과 + var o초과 = fpSpread1_Sheet1.Cells[row, i - (startindex + 0)].Value; + + float 이월, 발생, 사용, 잔여, 초과; + 이월 = o이월 != null ? float.Parse(o이월.ToString()) : 0; + 발생 = o발생 != null ? float.Parse(o발생.ToString()) : 0; + 사용 = o사용 != null ? float.Parse(o사용.ToString()) : 0; + 잔여 = o잔여 != null ? float.Parse(o잔여.ToString()) : 0; + 초과 = o초과 != null ? float.Parse(o초과.ToString()) : 0; + + + var 소진율 = 0f; + if ((발생 + 이월) != 0) 소진율 = (사용 / (발생 + 이월)) * 100f; + var 소진율2 = 0f; + if (발생 != 0) 소진율2 = ((사용 - 이월) / 발생) * 100f; + + if (colname.StartsWith("소진율")) + { + + fpSpread1_Sheet1.SetValue(row, i - 1, 소진율);//.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})"); + fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1; + } + else + { + fpSpread1_Sheet1.SetValue(row, i - 1, 소진율2);// fpSpread1_Sheet1.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})"); + fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1; + } + //var 발생 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 4); //var 사용 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 3); //var 사용률 = 0.0; diff --git a/SubProject/FBS0000/fLovWorkUser.Designer.cs b/SubProject/FBS0000/fLovWorkUser.Designer.cs index d585bd0..a83004f 100644 --- a/SubProject/FBS0000/fLovWorkUser.Designer.cs +++ b/SubProject/FBS0000/fLovWorkUser.Designer.cs @@ -75,7 +75,6 @@ this.arDatagridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.arDatagridView1.Size = new System.Drawing.Size(313, 496); this.arDatagridView1.TabIndex = 0; - this.arDatagridView1.DoubleClick += new System.EventHandler(this.arDatagridView1_DoubleClick); this.arDatagridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.arDatagridView1_KeyDown); // // bs diff --git a/SubProject/FBS0000/fLovWorkUser.cs b/SubProject/FBS0000/fLovWorkUser.cs index 6a45e9a..5741ee6 100644 --- a/SubProject/FBS0000/fLovWorkUser.cs +++ b/SubProject/FBS0000/fLovWorkUser.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FBS0000 { - public partial class fLovWorkUser : Form + public partial class fLovWorkUser : fBase { public dsMSSQL.EETGW_WorkTableUserRow dr = null; public fLovWorkUser(List users) @@ -22,16 +23,12 @@ namespace FBS0000 private void fLovWorkUser_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); this.arDatagridView1.AutoResizeColumns(); } - - private void arDatagridView1_DoubleClick(object sender, EventArgs e) - { - - } - + private void arDatagridView1_KeyDown(object sender, KeyEventArgs e) { if(e.KeyCode == Keys.Enter) diff --git a/SubProject/FBS0000/fMinutes.cs b/SubProject/FBS0000/fMinutes.cs index dab47a5..63004b1 100644 --- a/SubProject/FBS0000/fMinutes.cs +++ b/SubProject/FBS0000/fMinutes.cs @@ -30,11 +30,13 @@ namespace FBS0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); refreshData(); } + void refreshData() { //refresh data diff --git a/SubProject/FBS0000/fMinutesDetail.cs b/SubProject/FBS0000/fMinutesDetail.cs index a810b72..ad78a47 100644 --- a/SubProject/FBS0000/fMinutesDetail.cs +++ b/SubProject/FBS0000/fMinutesDetail.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FBS0000 { - public partial class fMinutesDetail : Form + public partial class fMinutesDetail : fBase { int idx = -1; public fMinutesDetail(int idx_) @@ -27,13 +28,13 @@ namespace FBS0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); //refresh Data this.ta.FillByIDX(this.dsMSSQL.minutes,this.idx); } - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { var f = new FCM0000.fLovProject(""); diff --git a/SubProject/FCM0000/.vs/FCM0000.csproj.dtbcache.json b/SubProject/FCM0000/.vs/FCM0000.csproj.dtbcache.json new file mode 100644 index 0000000..7c3be0f --- /dev/null +++ b/SubProject/FCM0000/.vs/FCM0000.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000","ProjectFileName":"FCM0000.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Board\\fPatchList.cs"},{"SourceFile":"Board\\fPatchList.Designer.cs"},{"SourceFile":"DSMail.Designer.cs"},{"SourceFile":"dsMSSQL.cs"},{"SourceFile":"DSPMP.Designer.cs"},{"SourceFile":"DSReport.cs"},{"SourceFile":"DSUser.Designer.cs"},{"SourceFile":"Form2.cs"},{"SourceFile":"Form2.Designer.cs"},{"SourceFile":"fSIDListSelect.cs"},{"SourceFile":"fSIDListSelect.Designer.cs"},{"SourceFile":"Item\\fItemEdit.cs"},{"SourceFile":"Item\\fItemEdit.Designer.cs"},{"SourceFile":"Mail\\fAutoSendSetting.cs"},{"SourceFile":"Mail\\fAutoSendSetting.Designer.cs"},{"SourceFile":"Mail\\fMailAutoAdd.cs"},{"SourceFile":"Mail\\fMailAutoAdd.Designer.cs"},{"SourceFile":"Mail\\fMailBackup.cs"},{"SourceFile":"Mail\\fMailBackup.Designer.cs"},{"SourceFile":"Mail\\fJRForm.cs"},{"SourceFile":"Mail\\fJRForm.Designer.cs"},{"SourceFile":"Mail\\fMailList.cs"},{"SourceFile":"Mail\\fMailList.Designer.cs"},{"SourceFile":"Mail\\fSendMail.cs"},{"SourceFile":"Mail\\fSendMail.Designer.cs"},{"SourceFile":"Board\\fRequestItem.cs"},{"SourceFile":"Board\\fRequestItem.Designer.cs"},{"SourceFile":"Board\\fRequestItem_Add.cs"},{"SourceFile":"Board\\fRequestItem_Add.Designer.cs"},{"SourceFile":"DSInventory.Designer.cs"},{"SourceFile":"dsMSSQL.Designer.cs"},{"SourceFile":"DSQuery.Designer.cs"},{"SourceFile":"DSReport.Designer.cs"},{"SourceFile":"fCode.cs"},{"SourceFile":"fCode.Designer.cs"},{"SourceFile":"Inventory\\fInventoryJagoList.cs"},{"SourceFile":"Inventory\\fInventoryJagoList.Designer.cs"},{"SourceFile":"Inventory\\finventoryAdd.cs"},{"SourceFile":"Inventory\\finventoryAdd.Designer.cs"},{"SourceFile":"Inventory\\fInventoryJagoPlace.cs"},{"SourceFile":"Inventory\\fInventoryJagoPlace.Designer.cs"},{"SourceFile":"User\\fLovUser.cs"},{"SourceFile":"User\\fLovUser.Designer.cs"},{"SourceFile":"Item\\fItemAdd.cs"},{"SourceFile":"Item\\fItemAdd.Designer.cs"},{"SourceFile":"User\\fUserAuth.cs"},{"SourceFile":"User\\fUserAuth.Designer.cs"},{"SourceFile":"User\\fUserGroup.cs"},{"SourceFile":"User\\fUserGroup.Designer.cs"},{"SourceFile":"User\\fUserGroupDev.cs"},{"SourceFile":"User\\fUserGroupDev.Designer.cs"},{"SourceFile":"fCustoms.cs"},{"SourceFile":"fCustoms.Designer.cs"},{"SourceFile":"User\\fUserGroupPermission.cs"},{"SourceFile":"User\\fUserGroupPermission.Designer.cs"},{"SourceFile":"Inventory\\fInventoryUser.cs"},{"SourceFile":"Inventory\\fInventoryUser.Designer.cs"},{"SourceFile":"Inventory\\fInventory.cs"},{"SourceFile":"Inventory\\fInventory.Designer.cs"},{"SourceFile":"Item\\fItems.cs"},{"SourceFile":"Item\\fItems.Designer.cs"},{"SourceFile":"fHolidaytable.cs"},{"SourceFile":"fHolidaytable.Designer.cs"},{"SourceFile":"Item\\fLovOneItem.cs"},{"SourceFile":"Item\\fLovOneItem.Designer.cs"},{"SourceFile":"fLovSupply.cs"},{"SourceFile":"fLovSupply.Designer.cs"},{"SourceFile":"fLovProject.cs"},{"SourceFile":"fLovProject.Designer.cs"},{"SourceFile":"Item\\fLovItem.cs"},{"SourceFile":"Item\\fLovItem.Designer.cs"},{"SourceFile":"Mail\\fMailform.cs"},{"SourceFile":"Mail\\fMailform.Designer.cs"},{"SourceFile":"Customer_Import.cs"},{"SourceFile":"Customer_Import.Designer.cs"},{"SourceFile":"fMaterial_Import.cs"},{"SourceFile":"fMaterial_Import.Designer.cs"},{"SourceFile":"fSelectDate.cs"},{"SourceFile":"fSelectDate.Designer.cs"},{"SourceFile":"Inventory\\RepInvStockUser.cs"},{"SourceFile":"Inventory\\RepInvStockUser.Designer.cs"},{"SourceFile":"Inventory\\RepInvStock.cs"},{"SourceFile":"Inventory\\RepInvStock.Designer.cs"},{"SourceFile":"MethodExtentions.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"FPUtil.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\arCtl\\bin\\debug\\arControl.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\ArSetting.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Excel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Localization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PDF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PluginCalendar.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Chart.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Spread.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCOMMON\\bin\\Debug\\FCOMMON.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Win.PluginInputMan.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\libxl.net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\NetOffice.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetSpell.2.1.7\\lib\\NetSpell.SpellChecker.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\OfficeApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Outlook.1.8.1\\lib\\net40\\OutlookApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\RichTextBoxEx.1.0.0\\lib\\PrintRichTextBox.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\RichTextBoxEx.1.0.0\\lib\\RichTextBoxEx.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\VBIDEApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000\\bin\\debug\\FCM0000.exe","OutputItemRelativePath":"FCM0000.exe"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000\\bin\\debug\\FCM0000.pdb","OutputItemRelativePath":"FCM0000.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/FCM0000/Board/fPatchList.cs b/SubProject/FCM0000/Board/fPatchList.cs index deeed15..aa7103a 100644 --- a/SubProject/FCM0000/Board/fPatchList.cs +++ b/SubProject/FCM0000/Board/fPatchList.cs @@ -32,6 +32,7 @@ namespace FCM0000 private void fRequestItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); if (FCOMMON.info.Login.level >= 9 || FCOMMON.info.Login.no == "395552") { bn.Enabled = true; @@ -45,7 +46,7 @@ namespace FCM0000 } refreshData(); } - + private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { this.Validate(); @@ -54,12 +55,7 @@ namespace FCM0000 } - private void fillToolStripButton_Click(object sender, EventArgs e) - { - - - } - + void refreshData() { try diff --git a/SubProject/FCM0000/Board/fRequestItem.cs b/SubProject/FCM0000/Board/fRequestItem.cs index e03d721..0bc156e 100644 --- a/SubProject/FCM0000/Board/fRequestItem.cs +++ b/SubProject/FCM0000/Board/fRequestItem.cs @@ -31,24 +31,19 @@ namespace FCM0000 private void fRequestItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.AddDays(-15).ToShortDateString(); this.dtED.Text = DateTime.Now.ToShortDateString(); refreshData(); } - + private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { this.Validate(); this.bs.EndEdit(); this.tam.UpdateAll(this.dsMSSQL); - } - private void fillToolStripButton_Click(object sender, EventArgs e) - { - - - } void refreshData() { diff --git a/SubProject/FCM0000/Board/fRequestItem_Add.cs b/SubProject/FCM0000/Board/fRequestItem_Add.cs index 52de5a2..80c339e 100644 --- a/SubProject/FCM0000/Board/fRequestItem_Add.cs +++ b/SubProject/FCM0000/Board/fRequestItem_Add.cs @@ -23,6 +23,7 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //프로젝트 리스트를 가져와서 cmb에 연결해준다. var projectDT = FCOMMON.DBM.getProjectData(); this.cmProject.DataSource = projectDT; @@ -57,6 +58,7 @@ namespace FCM0000 tbRemark.Html = dr.remark; } } + private void requestItemBindingNavigatorSaveItem_Click(object sender, EventArgs e) { diff --git a/SubProject/FCM0000/Customer_Import.cs b/SubProject/FCM0000/Customer_Import.cs index d40fec4..1fde6cc 100644 --- a/SubProject/FCM0000/Customer_Import.cs +++ b/SubProject/FCM0000/Customer_Import.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class Customer_Import : Form + public partial class Customer_Import : fBase { DataTable dt = new dsMSSQL.CustomsDataTable(); DataTable dtExcel = new DataTable(); @@ -22,6 +23,7 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.sd.Value = DateTime.Now.AddMonths(-1); this.ed.Value = DateTime.Now; } @@ -30,7 +32,7 @@ namespace FCM0000 { } - + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { OpenFileDialog od = new OpenFileDialog(); diff --git a/SubProject/FCM0000/Form2.cs b/SubProject/FCM0000/Form2.cs index b6e1f3a..97b07c8 100644 --- a/SubProject/FCM0000/Form2.cs +++ b/SubProject/FCM0000/Form2.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,11 +11,18 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class Form2 : Form + public partial class Form2 : fBase { public Form2() { InitializeComponent(); } + + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } } } diff --git a/SubProject/FCM0000/Inventory/RepInvStock.cs b/SubProject/FCM0000/Inventory/RepInvStock.cs index 5b7cb7f..3ca9334 100644 --- a/SubProject/FCM0000/Inventory/RepInvStock.cs +++ b/SubProject/FCM0000/Inventory/RepInvStock.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,16 +10,18 @@ using System.Windows.Forms; namespace FCM0000.Inventory { - public partial class RepInvStock : Form + public partial class RepInvStock : fBase { public RepInvStock() { InitializeComponent(); Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; } + private void RepInvStock_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FCM0000/Inventory/fInventory.cs b/SubProject/FCM0000/Inventory/fInventory.cs index 0f1f86d..d12498a 100644 --- a/SubProject/FCM0000/Inventory/fInventory.cs +++ b/SubProject/FCM0000/Inventory/fInventory.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fInventory : Form + public partial class fInventory : fBase { string fn_fpcolsize = ""; public fInventory() @@ -65,8 +65,10 @@ namespace FCM0000 cmbPlace.Items.Add(item); cmbPlace.SelectedIndex = 0; } + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); this.Show(); diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs index 0454bf3..40393fa 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fInventoryJagoList : Form + public partial class fInventoryJagoList : fBase { string fn_fpcolsize = ""; public fInventoryJagoList() @@ -50,9 +51,10 @@ namespace FCM0000 var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, false); } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); this.Show(); diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs b/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs index 8e28db8..02989e8 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs @@ -21,9 +21,10 @@ namespace FCM0000.Inventory this.tbPumName.Tag = itemname; this.tbPumName.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) Lov_Item(tbPumName.Text, false); }; } - + private void fInventoryJagoPlace_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); button1.PerformClick(); diff --git a/SubProject/FCM0000/Inventory/fInventoryUser.cs b/SubProject/FCM0000/Inventory/fInventoryUser.cs index 25623b9..7908b3c 100644 --- a/SubProject/FCM0000/Inventory/fInventoryUser.cs +++ b/SubProject/FCM0000/Inventory/fInventoryUser.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fInventoryUser : Form + public partial class fInventoryUser : fBase { public fInventoryUser() { @@ -63,7 +64,7 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { // TODO: 이 코드는 데이터를 'dsMSSQL.InventoryUser' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. - + EnsureVisibleAndUsableSize(); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); this.Show(); diff --git a/SubProject/FCM0000/Inventory/finventoryAdd.cs b/SubProject/FCM0000/Inventory/finventoryAdd.cs index 24a714a..020bd6c 100644 --- a/SubProject/FCM0000/Inventory/finventoryAdd.cs +++ b/SubProject/FCM0000/Inventory/finventoryAdd.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class finventoryAdd : Form + public partial class finventoryAdd : fBase { BindingSource bsManu; BindingSource bsModel; @@ -39,9 +40,10 @@ namespace FCM0000 } } } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //담당자목록 var userList = FCOMMON.DBM.getUserList();//.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); foreach (var user in userList) diff --git a/SubProject/FCM0000/Item/fItemAdd.Designer.cs b/SubProject/FCM0000/Item/fItemAdd.Designer.cs index dac4063..5b14eda 100644 --- a/SubProject/FCM0000/Item/fItemAdd.Designer.cs +++ b/SubProject/FCM0000/Item/fItemAdd.Designer.cs @@ -380,7 +380,6 @@ this.MinimumSize = new System.Drawing.Size(685, 448); this.Name = "fItemAdd"; this.Text = "품목 추가"; - this.Load += new System.EventHandler(this.fItemAdd_Load); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index eed2b94..186ed06 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -1,4 +1,5 @@ -using FCOMMON; +using FarPoint.Excel.EntityClassLibrary.SpreadsheetML; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -43,14 +44,10 @@ namespace FCM0000.Item } } - private void fItemAdd_Load(object sender, EventArgs e) + protected override void OnLoad(EventArgs e) { - if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal; - if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0) - { - this.Location = new Point(0, 0); - } - this.Show(); + base.OnLoad(e); + EnsureVisibleAndUsableSize(); //Application.DoEvents(); if (tbSid.Text.isEmpty()) tbSid.Focus(); @@ -77,7 +74,8 @@ namespace FCM0000.Item else { //이떄는 sid가 정상이어야 한다. - if (tbSid.Text.StartsWith("10") == false || tbSid.TextLength != 9) + var siddata = tbSid.Text.Split('-')[0].Trim(); + if (siddata.StartsWith("10") == false || siddata.Length != 9) { Util.MsgE("SID는 9자리 숫자이며 10으로 시작 합니다\n입력값을 확인 하세요"); tbSid.Focus(); @@ -87,9 +85,12 @@ namespace FCM0000.Item if (ta.ExistSID(FCOMMON.info.Login.gcode, tbSid.Text) > 0) { - Util.MsgE("동일한 SID정보가 있습니다\n화면을 닫은 후 SID로 검색하세요"); - this.Close(); - return; + var dlg = Util.MsgQ("동일한 SID정보가 있습니다\n강제입력을 진행할까요?\n입력값을 다시 확인하세요.\n품목정보에서 해당 SID정보를 검색해보세요"); + if(dlg != DialogResult.Yes) + { + + return; + } } } diff --git a/SubProject/FCM0000/Item/fItemEdit.cs b/SubProject/FCM0000/Item/fItemEdit.cs index 479b328..ed3aca2 100644 --- a/SubProject/FCM0000/Item/fItemEdit.cs +++ b/SubProject/FCM0000/Item/fItemEdit.cs @@ -47,14 +47,11 @@ namespace FCM0000.Item SendKeys.Send("{TAB}"); } } - + private void fItemAdd_Load(object sender, EventArgs e) { - if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal; - if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0) - { - this.Location = new Point(0, 0); - } + EnsureVisibleAndUsableSize(); + tbSid.Text = dr.IssidNull() == false ? dr.sid : string.Empty; tbName.Text = dr.IsnameNull() == false ? dr.name : string.Empty; diff --git a/SubProject/FCM0000/Item/fItems.cs b/SubProject/FCM0000/Item/fItems.cs index a7186bb..056744c 100644 --- a/SubProject/FCM0000/Item/fItems.cs +++ b/SubProject/FCM0000/Item/fItems.cs @@ -28,9 +28,10 @@ namespace FCM0000 void fItems_FormClosed(object sender, FormClosedEventArgs e) { } + private void fItems_Load(object sender, EventArgs e) { - //get catelist + EnsureVisibleAndUsableSize(); var cateList = FCOMMON.DBM.getGroupTable("cate", "Items", "isnull(cate,'') <> ''"); this.cmbCate.Items.Clear(); this.cmbCate.Items.Add("-- All --"); diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs index 9799ab4..bd8a4db 100644 --- a/SubProject/FCM0000/Item/fLovItem.cs +++ b/SubProject/FCM0000/Item/fLovItem.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fLovItem : Form + public partial class fLovItem : fBase { string fn_fpcolsize = ""; @@ -59,10 +60,10 @@ namespace FCM0000 this.tbFind.Text = search_; this.StartPosition = FormStartPosition.CenterScreen; } - + private void fLovItem_Load(object sender, EventArgs e) { - this.Show(); + EnsureVisibleAndUsableSize(); Application.DoEvents(); diff --git a/SubProject/FCM0000/Item/fLovOneItem.cs b/SubProject/FCM0000/Item/fLovOneItem.cs index 56e86f4..aa79bc9 100644 --- a/SubProject/FCM0000/Item/fLovOneItem.cs +++ b/SubProject/FCM0000/Item/fLovOneItem.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fLovOneItem : Form + public partial class fLovOneItem : fBase { public string Title { get; set; } DataTable dt; @@ -49,8 +50,10 @@ namespace FCM0000 }; } + private void fLovItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.bs.DataSource = this.dt; this.bn.BindingSource = this.bs; this.dv.DataSource = this.bs; diff --git a/SubProject/FCM0000/Mail/fAutoSendSetting.cs b/SubProject/FCM0000/Mail/fAutoSendSetting.cs index 8ae9d12..9100df8 100644 --- a/SubProject/FCM0000/Mail/fAutoSendSetting.cs +++ b/SubProject/FCM0000/Mail/fAutoSendSetting.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000.Mail { - public partial class fAutoSendSetting : Form + public partial class fAutoSendSetting : fBase { string fn_fpcolsize = ""; public fAutoSendSetting() @@ -25,9 +26,10 @@ namespace FCM0000.Mail { FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); refreshData(); } private void refreshData() diff --git a/SubProject/FCM0000/Mail/fJRForm.cs b/SubProject/FCM0000/Mail/fJRForm.cs index 468b2d9..780b6f3 100644 --- a/SubProject/FCM0000/Mail/fJRForm.cs +++ b/SubProject/FCM0000/Mail/fJRForm.cs @@ -27,10 +27,11 @@ namespace FCM0000 e.Row["cate"] = "--"; e.Row["gcode"] = FCOMMON.info.Login.gcode; } - + private void fMailform_Load(object sender, EventArgs e) { - refreshData(); + EnsureVisibleAndUsableSize(); + refreshData(); } void refreshData() diff --git a/SubProject/FCM0000/Mail/fMailAutoAdd.cs b/SubProject/FCM0000/Mail/fMailAutoAdd.cs index dd3c53b..07e9acc 100644 --- a/SubProject/FCM0000/Mail/fMailAutoAdd.cs +++ b/SubProject/FCM0000/Mail/fMailAutoAdd.cs @@ -21,10 +21,9 @@ namespace FCM0000 PredefinedButtonSets.SetupDefaultButtons(this.tbBody); this.dr = dr_; } - private void fMailform_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //시작일을 오늘로 this.dtSd.Value = DateTime.Now; diff --git a/SubProject/FCM0000/Mail/fMailBackup.cs b/SubProject/FCM0000/Mail/fMailBackup.cs index 0925648..3f75386 100644 --- a/SubProject/FCM0000/Mail/fMailBackup.cs +++ b/SubProject/FCM0000/Mail/fMailBackup.cs @@ -10,10 +10,11 @@ using NetOffice; using Outlook = NetOffice.OutlookApi; using NetOffice.OutlookApi.Enums; using NetOffice.OutlookApi; +using FCOMMON; namespace FCM0000.Mail { - public partial class fMailBackup : Form + public partial class fMailBackup : fBase { public fMailBackup() { @@ -23,7 +24,12 @@ namespace FCM0000.Mail dateTimePicker1.Value = DateTime.Now.AddYears(-2); dateTimePicker2.Value = DateTime.Now.AddYears(-1); } - + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } + int cntp = 0; // int cnte = 0; int cntb = 0; diff --git a/SubProject/FCM0000/Mail/fMailList.cs b/SubProject/FCM0000/Mail/fMailList.cs index a6ff0a5..d130727 100644 --- a/SubProject/FCM0000/Mail/fMailList.cs +++ b/SubProject/FCM0000/Mail/fMailList.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000.Mail { - public partial class fMailList : Form + public partial class fMailList : fBase { string fn_fpcolsize = ""; public fMailList() @@ -33,12 +34,12 @@ namespace FCM0000.Mail } private void __Load(object sender, EventArgs e) { - //한달전으로 처리 + EnsureVisibleAndUsableSize(); this.dtEd.Value = DateTime.Now; this.dtSd.Value = DateTime.Now.AddDays(-10); refreshData(); } - + private void fillToolStripButton_Click(object sender, EventArgs e) { diff --git a/SubProject/FCM0000/Mail/fMailform.cs b/SubProject/FCM0000/Mail/fMailform.cs index 02a5365..2f9ce98 100644 --- a/SubProject/FCM0000/Mail/fMailform.cs +++ b/SubProject/FCM0000/Mail/fMailform.cs @@ -32,9 +32,10 @@ namespace FCM0000 private void fMailform_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); refreshData(); } - + void refreshData() { try diff --git a/SubProject/FCM0000/Mail/fSendMail.cs b/SubProject/FCM0000/Mail/fSendMail.cs index fe331fc..eeb865d 100644 --- a/SubProject/FCM0000/Mail/fSendMail.cs +++ b/SubProject/FCM0000/Mail/fSendMail.cs @@ -32,9 +32,11 @@ namespace FCM0000 private void fMailform_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.bs.AddNew(); LoadNRData(); } + void LoadNRData() { diff --git a/SubProject/FCM0000/User/fLovUser.cs b/SubProject/FCM0000/User/fLovUser.cs index 24132e8..a15ecb8 100644 --- a/SubProject/FCM0000/User/fLovUser.cs +++ b/SubProject/FCM0000/User/fLovUser.cs @@ -40,7 +40,7 @@ namespace FCM0000 { btOK.PerformClick(); } - + void fpSpread1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) @@ -51,6 +51,7 @@ namespace FCM0000 private void fLovItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Text = string.Format("사용자선택({0})",this.keyword); this.Show(); Application.DoEvents(); diff --git a/SubProject/FCM0000/User/fUserAuth.cs b/SubProject/FCM0000/User/fUserAuth.cs index 8e81b30..a9a52cf 100644 --- a/SubProject/FCM0000/User/fUserAuth.cs +++ b/SubProject/FCM0000/User/fUserAuth.cs @@ -21,10 +21,11 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); refreshData(); this.dSUser.Auth.TableNewRow += Customs_TableNewRow; } + void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e) { diff --git a/SubProject/FCM0000/User/fUserGroup.cs b/SubProject/FCM0000/User/fUserGroup.cs index b96fb33..2638dfe 100644 --- a/SubProject/FCM0000/User/fUserGroup.cs +++ b/SubProject/FCM0000/User/fUserGroup.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fUserGroup : Form + public partial class fUserGroup : fBase { public fUserGroup() { @@ -19,6 +20,7 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); refreshData(); } diff --git a/SubProject/FCM0000/User/fUserGroupDev.cs b/SubProject/FCM0000/User/fUserGroupDev.cs index ef6ca0f..88d20aa 100644 --- a/SubProject/FCM0000/User/fUserGroupDev.cs +++ b/SubProject/FCM0000/User/fUserGroupDev.cs @@ -21,11 +21,11 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); refreshData(); this.dSUser.UserGroup.TableNewRow += Customs_TableNewRow; } - + void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e) { //e.Row["wuid"] = FCOMMON.info.Login.no; diff --git a/SubProject/FCM0000/User/fUserGroupPermission.cs b/SubProject/FCM0000/User/fUserGroupPermission.cs index bb56817..cd8c01c 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.cs +++ b/SubProject/FCM0000/User/fUserGroupPermission.cs @@ -21,6 +21,7 @@ namespace FCM0000 private void fUserGroupPermission_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); foreach(var ctl in this.Controls) { if(ctl.GetType() == typeof(CheckBox)) @@ -33,7 +34,7 @@ namespace FCM0000 } } } - + private void button1_Click(object sender, EventArgs e) { diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index 8b7d7e1..4826ad0 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -37,9 +37,11 @@ namespace FCM0000 } e.Row["grp"] = grp; } + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); tbFind.Text = string.Empty; if (this.defaultgubun.isEmpty() == false) { diff --git a/SubProject/FCM0000/fCustoms.cs b/SubProject/FCM0000/fCustoms.cs index 720b060..c407bb7 100644 --- a/SubProject/FCM0000/fCustoms.cs +++ b/SubProject/FCM0000/fCustoms.cs @@ -20,10 +20,10 @@ namespace FCM0000 fn_fpcolsize1 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp1_" + this.Name + ".ini"); fn_fpcolsize2 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp2_" + this.Name + ".ini"); } - + private void __Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsMSSQL.Staff' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FCM0000/fHolidaytable.cs b/SubProject/FCM0000/fHolidaytable.cs index 9c201db..b0bf7e7 100644 --- a/SubProject/FCM0000/fHolidaytable.cs +++ b/SubProject/FCM0000/fHolidaytable.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fHolidaytable : Form + public partial class fHolidaytable : fBase { public string Title { get; set; } // DataTable dt; @@ -28,16 +29,13 @@ namespace FCM0000 { } - + private void fLovItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.textBox1.Text = DateTime.Now.ToString("yyyy-MM"); refreshData(); - //if(dv.Columns.Count > 1) - // this.dv.Columns[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - //else - // this.dv.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } void refreshData() { diff --git a/SubProject/FCM0000/fLovProject.cs b/SubProject/FCM0000/fLovProject.cs index e0356be..6b5505e 100644 --- a/SubProject/FCM0000/fLovProject.cs +++ b/SubProject/FCM0000/fLovProject.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fLovProject : Form + public partial class fLovProject : fBase { public string Title { get; set; } public int Index { get; set; } @@ -36,10 +37,10 @@ namespace FCM0000 }; } - + private void fLovItem_Load(object sender, EventArgs e) { - //search data + EnsureVisibleAndUsableSize(); // var dt = this.ta.GetSearch(this.keyword); var statekey = this.keyword2; diff --git a/SubProject/FCM0000/fLovSupply.cs b/SubProject/FCM0000/fLovSupply.cs index 5d5daad..2aa0cdf 100644 --- a/SubProject/FCM0000/fLovSupply.cs +++ b/SubProject/FCM0000/fLovSupply.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fLovSupply : Form + public partial class fLovSupply : fBase { public string Title { get; set; } public int Index { get; set; } @@ -30,9 +31,10 @@ namespace FCM0000 }; } - + private void fLovItem_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%",FCOMMON.info.Login.gcode); } diff --git a/SubProject/FCM0000/fMaterial_Import.cs b/SubProject/FCM0000/fMaterial_Import.cs index 1b5bf9b..fdcd634 100644 --- a/SubProject/FCM0000/fMaterial_Import.cs +++ b/SubProject/FCM0000/fMaterial_Import.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fMaterial_Import : Form + public partial class fMaterial_Import : fBase { DataTable dt = new dsMSSQL.ItemsDataTable();// dsPurchase.PurchaseDataTable(); DataTable dtExcel = new DataTable(); @@ -22,11 +23,10 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsMSSQL.Items' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. - //this.ta.Fill(this.dsMSSQL.Items); + EnsureVisibleAndUsableSize(); } - + void __Closed(object sender, FormClosedEventArgs e) { diff --git a/SubProject/FCM0000/fSIDListSelect.cs b/SubProject/FCM0000/fSIDListSelect.cs index a7a6baa..a26a824 100644 --- a/SubProject/FCM0000/fSIDListSelect.cs +++ b/SubProject/FCM0000/fSIDListSelect.cs @@ -12,7 +12,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fSIDListSelect : Form + public partial class fSIDListSelect : fBase { public string selectbatch = ""; public fSIDListSelect(string sid,DataTable dt) @@ -49,8 +49,10 @@ namespace FCM0000 private void fSIDListSelect_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dv1.AutoResizeColumns(); } + private void btopenspm_Click(object sender, EventArgs e) { diff --git a/SubProject/FCM0000/fSelectDate.cs b/SubProject/FCM0000/fSelectDate.cs index 5ce4555..509cdd0 100644 --- a/SubProject/FCM0000/fSelectDate.cs +++ b/SubProject/FCM0000/fSelectDate.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FCM0000 { - public partial class fSelectDate : Form + public partial class fSelectDate : fBase { private DateTime _dtSelect = DateTime.Now; public DateTime dtSelect @@ -34,9 +35,9 @@ namespace FCM0000 private void fSelectDate_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } - + private void btOK_Click(object sender, EventArgs e) { dtSelect = this.monthCalendar1.SelectionStart; diff --git a/SubProject/FCOMMON/fBase.cs b/SubProject/FCOMMON/fBase.cs index 44431b1..b8748f2 100644 --- a/SubProject/FCOMMON/fBase.cs +++ b/SubProject/FCOMMON/fBase.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.ServiceModel.Security; using System.Text; using System.Windows.Forms; @@ -41,12 +42,28 @@ namespace FCOMMON { var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); - } - if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal; - if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0) - this.Location = new Point(0, 0); + EnsureVisibleAndUsableSize(); } + + protected void EnsureVisibleAndUsableSize() + { + var visibleBounds = Screen.GetWorkingArea(this); + var isOutOfView = (Left > visibleBounds.Right) || (Top > visibleBounds.Bottom) || + (Right < visibleBounds.Left) || (Bottom < visibleBounds.Top); + if (isOutOfView) + { + CenterToScreen(); + } + var minW = Math.Max(320, this.MinimumSize.Width); + var minH = Math.Max(240, this.MinimumSize.Height); + + if (Width < minW || Height < minH) + { + this.Size = new Size(minW, minH); + } + } + } } diff --git a/SubProject/FCOMMON/fFTPExplorer.cs b/SubProject/FCOMMON/fFTPExplorer.cs index 1f49e55..c0f3079 100644 --- a/SubProject/FCOMMON/fFTPExplorer.cs +++ b/SubProject/FCOMMON/fFTPExplorer.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fFTPExplorer : Form + public partial class fFTPExplorer : fBase { string homePath = string.Empty; string curPath = string.Empty; @@ -74,6 +74,7 @@ namespace FCOMMON private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbpath.Text = this.curPath;// Pub.setting.ftp_path; if (this.tbpath.Text == "") tbpath.Text = "/"; timer1.Start(); @@ -90,6 +91,7 @@ namespace FCOMMON } btQuery.PerformClick(); } + void listView1_DragOver(object sender, DragEventArgs e) { this.Cursor = Cursors.Hand; diff --git a/SubProject/FCOMMON/fFileExplorer.cs b/SubProject/FCOMMON/fFileExplorer.cs index 05253be..48d4363 100644 --- a/SubProject/FCOMMON/fFileExplorer.cs +++ b/SubProject/FCOMMON/fFileExplorer.cs @@ -1,4 +1,5 @@ -using System; +using FarPoint.Win.Spread.Model; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fFileExplorer : Form + public partial class fFileExplorer : fBase { string p = string.Empty; public fFileExplorer(string path_) @@ -22,11 +23,12 @@ namespace FCOMMON private void fFileExplorer_Load(object sender, EventArgs e) { - this.Show(); + EnsureVisibleAndUsableSize(); Application.DoEvents(); RefreshPath(); } + void RefreshPath() { if (System.IO.Directory.Exists(this.p) == false) diff --git a/SubProject/FCOMMON/fInputTextBox.cs b/SubProject/FCOMMON/fInputTextBox.cs index 9ad4b63..b87ce44 100644 --- a/SubProject/FCOMMON/fInputTextBox.cs +++ b/SubProject/FCOMMON/fInputTextBox.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fInputTextBox : Form + public partial class fInputTextBox : fBase { public fInputTextBox() { @@ -21,5 +21,12 @@ namespace FCOMMON { DialogResult = DialogResult.OK; } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } + } } diff --git a/SubProject/FCOMMON/fLovDateList.cs b/SubProject/FCOMMON/fLovDateList.cs index 6a24e13..d9ddfc3 100644 --- a/SubProject/FCOMMON/fLovDateList.cs +++ b/SubProject/FCOMMON/fLovDateList.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fLovDateList : Form + public partial class fLovDateList : fBase { public string selectedDate = string.Empty; public fLovDateList(List dateList) @@ -24,8 +24,9 @@ namespace FCOMMON } private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } + void fLovDateList_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Escape) this.Close(); diff --git a/SubProject/FCOMMON/fMagam.cs b/SubProject/FCOMMON/fMagam.cs index 58922cf..51258ed 100644 --- a/SubProject/FCOMMON/fMagam.cs +++ b/SubProject/FCOMMON/fMagam.cs @@ -10,8 +10,8 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fMagam : Form - { + public partial class fMagam : fBase + { public fMagam() { InitializeComponent(); @@ -19,7 +19,7 @@ namespace FCOMMON private void fMagam_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); button2.Enabled = curLevel >= 5; @@ -29,8 +29,8 @@ namespace FCOMMON textBox1.Text = DateTime.Now.ToString("yyyy-MM"); refreshList(); } - - void refreshList() + + void refreshList() { var lst = FCOMMON.DBM.GetMagamList(); this.listView1.Items.Clear(); diff --git a/SubProject/FCOMMON/fProgress.cs b/SubProject/FCOMMON/fProgress.cs index 1a49f60..5e3c8f0 100644 --- a/SubProject/FCOMMON/fProgress.cs +++ b/SubProject/FCOMMON/fProgress.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fProgress : Form + public partial class fProgress : fBase { public fProgress() { @@ -18,9 +18,9 @@ namespace FCOMMON private void fProgress_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } - + private string _title = string.Empty; public string Title { diff --git a/SubProject/FCOMMON/fSFI.cs b/SubProject/FCOMMON/fSFI.cs index 855068f..b06816f 100644 --- a/SubProject/FCOMMON/fSFI.cs +++ b/SubProject/FCOMMON/fSFI.cs @@ -11,7 +11,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fSFI : Form + public partial class fSFI : fBase { public fSFI(string sfi_type, double time, double cnt, double shiftcount, int itemcnt) { @@ -102,9 +102,10 @@ namespace FCOMMON private void fSFI_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); nudMSaveCnt.DecimalPlaces = 1; } - + private void nudSIFOffice_ValueChanged(object sender, EventArgs e) { //offcie update diff --git a/SubProject/FCOMMON/fSelectDay.cs b/SubProject/FCOMMON/fSelectDay.cs index ec7be03..25fc9f2 100644 --- a/SubProject/FCOMMON/fSelectDay.cs +++ b/SubProject/FCOMMON/fSelectDay.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fSelectDay : Form + public partial class fSelectDay : fBase { public fSelectDay(DateTime dt) { @@ -22,10 +22,10 @@ namespace FCOMMON { DialogResult = System.Windows.Forms.DialogResult.OK; } - + private void fSelectDay_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } } } diff --git a/SubProject/FCOMMON/fSelectDays.cs b/SubProject/FCOMMON/fSelectDays.cs index dfe13fe..4850522 100644 --- a/SubProject/FCOMMON/fSelectDays.cs +++ b/SubProject/FCOMMON/fSelectDays.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fSelectDays : Form + public partial class fSelectDays : fBase { public fSelectDays(DateTime dt,DateTime dte) { @@ -26,10 +26,10 @@ namespace FCOMMON { DialogResult = System.Windows.Forms.DialogResult.OK; } - + private void fSelectDay_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } } } diff --git a/SubProject/FCOMMON/fSelectMonth.cs b/SubProject/FCOMMON/fSelectMonth.cs index a8edf2f..c276925 100644 --- a/SubProject/FCOMMON/fSelectMonth.cs +++ b/SubProject/FCOMMON/fSelectMonth.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fSelectMonth : Form + public partial class fSelectMonth : fBase { public int selectmon { get; set; } public fSelectMonth() @@ -21,6 +21,7 @@ namespace FCOMMON private void fSelectMonth_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); for(int i = 1 ; i <=12;i++) { Button newbt = new Button(); @@ -31,7 +32,7 @@ namespace FCOMMON tableLayoutPanel1.Controls.Add(newbt); } } - + void newbt_Click(object sender, EventArgs e) { var bt = sender as Button; diff --git a/SubProject/FCOMMON/fSelectProcess.cs b/SubProject/FCOMMON/fSelectProcess.cs index c92d078..f0f8d18 100644 --- a/SubProject/FCOMMON/fSelectProcess.cs +++ b/SubProject/FCOMMON/fSelectProcess.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace FCOMMON { - public partial class fSelectProcess : Form + public partial class fSelectProcess : fBase { public List values = new List(); string[] curlist = new string[] { }; @@ -23,7 +23,7 @@ namespace FCOMMON private void fSelectProcess_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //공정목록 cmbProcess.Items.Clear(); //cmbProcess.Items.Add("--전체--"); @@ -33,7 +33,7 @@ namespace FCOMMON cmbProcess.Items.Add(item, curlist.Contains(item)); } } - + private void button1_Click(object sender, EventArgs e) { values.Clear(); diff --git a/SubProject/FED0000/Education/fEdulist.cs b/SubProject/FED0000/Education/fEdulist.cs index 2193ef3..5ad7327 100644 --- a/SubProject/FED0000/Education/fEdulist.cs +++ b/SubProject/FED0000/Education/fEdulist.cs @@ -92,10 +92,11 @@ namespace FED0000 e.Row["wdate"] = DateTime.Now; } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK; this.dtSD.Text = DateTime.Now.ToString("yyyy-01-01"); diff --git a/SubProject/FED0000/License/fLicenseList.cs b/SubProject/FED0000/License/fLicenseList.cs index 88e2d13..44fc646 100644 --- a/SubProject/FED0000/License/fLicenseList.cs +++ b/SubProject/FED0000/License/fLicenseList.cs @@ -54,12 +54,12 @@ namespace FED0000 e.Row["wdate"] = DateTime.Now; } - - private void __Load(object sender, EventArgs e) + + private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); refreshData(); } diff --git a/SubProject/FEQ0000/.vs/FEQ0000.csproj.dtbcache.json b/SubProject/FEQ0000/.vs/FEQ0000.csproj.dtbcache.json new file mode 100644 index 0000000..b68ca52 --- /dev/null +++ b/SubProject/FEQ0000/.vs/FEQ0000.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FEQ0000","ProjectFileName":"FEQ0000.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DataBaseManager.cs"},{"SourceFile":"DataClasses1.designer.cs"},{"SourceFile":"dsEQ.cs"},{"SourceFile":"dsEQ.Designer.cs"},{"SourceFile":"DSPrj.Designer.cs"},{"SourceFile":"dsPurchase.cs"},{"SourceFile":"dsPurchase.Designer.cs"},{"SourceFile":"EEDataSet.Designer.cs"},{"SourceFile":"Equipment\\EQFilterApply.cs"},{"SourceFile":"Equipment\\EQFilterApply.Designer.cs"},{"SourceFile":"Equipment\\EQfilterManager.cs"},{"SourceFile":"Equipment\\EQfilterManager.Designer.cs"},{"SourceFile":"Equipment\\fEquipment.cs"},{"SourceFile":"Equipment\\fEquipment.Designer.cs"},{"SourceFile":"Equipment\\fImpEquipment.cs"},{"SourceFile":"Equipment\\fImpEquipment.Designer.cs"},{"SourceFile":"Equipment\\rpt_equipmentAll.cs"},{"SourceFile":"Equipment\\rpt_equipmentAll.Designer.cs"},{"SourceFile":"fColumnFilter.cs"},{"SourceFile":"fColumnFilter.Designer.cs"},{"SourceFile":"fItemin.cs"},{"SourceFile":"fItemin.Designer.cs"},{"SourceFile":"fUserExportColumn.cs"},{"SourceFile":"fUserExportColumn.Designer.cs"},{"SourceFile":"MethodExtentions.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR.Designer.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_ConfRequest.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_ConfRequest.Designer.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB.Designer.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_Add.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_Add.Designer.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEBList.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEBList.Designer.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_Ipgo.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_Ipgo.Designer.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_ConfRequest.cs"},{"SourceFile":"PurchaseEB\\fPurchaseEB_ConfRequest.Designer.cs"},{"SourceFile":"PurchaseEB\\rPurchaseEB.cs"},{"SourceFile":"PurchaseEB\\rPurchaseEB.Designer.cs"},{"SourceFile":"fPurchaseConfirm.cs"},{"SourceFile":"fPurchaseConfirm.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR_ConfRequest.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR_ConfRequest.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR_Ipgo.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR_Ipgo.Designer.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_Ipgo.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_Ipgo.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNRList.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNRList.Designer.cs"},{"SourceFile":"PurchaseNR\\fInputSC.cs"},{"SourceFile":"PurchaseNR\\fInputSC.Designer.cs"},{"SourceFile":"PurchaseNR\\fMailForm.cs"},{"SourceFile":"PurchaseNR\\fMailForm.Designer.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_Add.cs"},{"SourceFile":"PurchaseCR\\fPurchaseCR_Add.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_excelimport.cs"},{"SourceFile":"PurchaseNR\\fPurchase_excelimport.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_AddS.cs"},{"SourceFile":"PurchaseNR\\fPurchase_AddS.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Add.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Add.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Data.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Data.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_ImportO.cs"},{"SourceFile":"PurchaseNR\\fPurchase_ImportO.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Import.cs"},{"SourceFile":"PurchaseNR\\fPurchase_Import.Designer.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR.cs"},{"SourceFile":"PurchaseNR\\fPurchaseNR.Designer.cs"},{"SourceFile":"PurchaseCR\\rPurchaseCR.cs"},{"SourceFile":"PurchaseCR\\rPurchaseCR.Designer.cs"},{"SourceFile":"PurchaseNR\\fSIDCheckNR.cs"},{"SourceFile":"PurchaseNR\\fSIDCheckNR.Designer.cs"},{"SourceFile":"PurchaseNR\\rPurchaseNR.cs"},{"SourceFile":"PurchaseNR\\rPurchaseNR.Designer.cs"},{"SourceFile":"Purchase\\fBatchUpdate.cs"},{"SourceFile":"Purchase\\fBatchUpdate.Designer.cs"},{"SourceFile":"SqlServerTypes\\Loader.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\AmkorRestfulService\\bin\\debug\\AmkorRestfulService.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\arCtl\\bin\\debug\\arControl.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\ArSetting.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Excel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Localization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PDF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PluginCalendar.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Chart.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Spread.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000\\bin\\debug\\FCM0000.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCOMMON\\bin\\Debug\\FCOMMON.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Win.PluginInputMan.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\libxl.net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Common7\\IDE\\PublicAssemblies\\Microsoft.mshtml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\Microsoft.VisualBasic.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\NetOffice.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\OfficeApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Outlook.1.8.1\\lib\\net40\\OutlookApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\VBIDEApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FEQ0000\\bin\\Debug\\FEQ0000.exe","OutputItemRelativePath":"FEQ0000.exe"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FEQ0000\\bin\\Debug\\FEQ0000.pdb","OutputItemRelativePath":"FEQ0000.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/FEQ0000/Equipment/EQFilterApply.cs b/SubProject/FEQ0000/Equipment/EQFilterApply.cs index a074e09..ef9c3fe 100644 --- a/SubProject/FEQ0000/Equipment/EQFilterApply.cs +++ b/SubProject/FEQ0000/Equipment/EQFilterApply.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class EQFilterApply : Form + public partial class EQFilterApply : fBase { //fEquipment.eTabletype divtype; @@ -27,10 +28,10 @@ namespace FEQ0000 { } - + private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); try { ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype, FCOMMON.info.Login.gcode); diff --git a/SubProject/FEQ0000/Equipment/EQfilterManager.cs b/SubProject/FEQ0000/Equipment/EQfilterManager.cs index 86858b8..114c4db 100644 --- a/SubProject/FEQ0000/Equipment/EQfilterManager.cs +++ b/SubProject/FEQ0000/Equipment/EQfilterManager.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class EQfilterManager : Form + public partial class EQfilterManager : fBase { string divtype = string.Empty; public EQfilterManager(string type_) @@ -28,9 +29,10 @@ namespace FEQ0000 e.Row["wdate"] = DateTime.Now; e.Row["gcode"] = FCOMMON.info.Login.gcode; } - + private void EQfilter_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); try { ta.Fill(this.dsEQ.EquipmentFilter, divtype, FCOMMON.info.Login.gcode); diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index fd71c3e..10a659b 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -9,10 +9,11 @@ using System.Windows.Forms; using System.CodeDom.Compiler; using System.Reflection; using Microsoft.CSharp; +using FCOMMON; namespace FEQ0000 { - public partial class fEquipment : Form + public partial class fEquipment : fBase { public enum eTabletype { @@ -113,9 +114,10 @@ namespace FEQ0000 } if (this.cmbDate.Items.Count > 0) this.cmbDate.SelectedIndex = 0; } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Text = string.Format("Equipment List({0})", this.dataType); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, true); diff --git a/SubProject/FEQ0000/Equipment/fImpEquipment.cs b/SubProject/FEQ0000/Equipment/fImpEquipment.cs index c321db2..379d0f3 100644 --- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,11 +10,11 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fImpEquipment : Form + public partial class fImpEquipment : fBase { DataTable dt = null; DataTable dtExcel = new DataTable(); - // fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD; + // fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD; public fImpEquipment(fEquipment.eTabletype type_) { InitializeComponent(); @@ -23,9 +24,10 @@ namespace FEQ0000 this.FormClosed += __Closed; dt = new dsEQ.EETGW_EquipmentDataTable(); } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize (); this.Text = string.Format("Data Import({0})", "ALL"); var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); @@ -282,8 +284,8 @@ namespace FEQ0000 if (i % 1000 == 0) Application.DoEvents(); var version = dr[11].ToString(); - var linecode = dr[12+1].ToString(); - var linedesc = dr[13+1].ToString(); + var linecode = dr[12 + 1].ToString(); + var linedesc = dr[13 + 1].ToString(); var lineT = string.Empty; var lineP = string.Empty; var grp2 = string.Empty; @@ -322,7 +324,7 @@ namespace FEQ0000 if (lineDrows.Length == 0) //라인코드가 없다. { //var linebuf = linedesc.Split('-'); - + //신규추가한다. var newli = lineTd.NewLineCodeRow(); diff --git a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs index ff40127..0ffe941 100644 --- a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs +++ b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class rpt_equipmentAll : Form + public partial class rpt_equipmentAll : fBase { dsEQ.EETGW_EquipmentDataTable dt; public rpt_equipmentAll(dsEQ.EETGW_EquipmentDataTable dt_,string title) @@ -24,10 +25,10 @@ namespace FEQ0000 } - + private void rpt_equipment_Load(object sender, EventArgs e) { - //this.Text = string.Format("Data Report({0})", "ALL"); + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FEQ0000/Purchase/fBatchUpdate.cs b/SubProject/FEQ0000/Purchase/fBatchUpdate.cs index 7b0e2cb..c19358a 100644 --- a/SubProject/FEQ0000/Purchase/fBatchUpdate.cs +++ b/SubProject/FEQ0000/Purchase/fBatchUpdate.cs @@ -12,7 +12,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fBatchUpdate : Form + public partial class fBatchUpdate : fBase { public fBatchUpdate(List _rows) { @@ -22,9 +22,10 @@ namespace FEQ0000.Purchase this.Text = $"일괄변경 : {_rows.Count} 건"; this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); }; } - + private void fBatchUpdate_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var code_state = DBM.getCodeTable("04"); cmbState.DataSource = code_state; cmbState.DisplayMember = "Value"; diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index 0fbcfe9..63459e2 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -161,8 +161,8 @@ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.label1 = new System.Windows.Forms.Label(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label2 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -276,6 +276,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -402,6 +403,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -752,6 +754,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; @@ -768,6 +771,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; @@ -824,6 +828,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -838,6 +843,7 @@ // tbManager // this.tbManager.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbManager.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbManager.Name = "tbManager"; this.tbManager.Size = new System.Drawing.Size(70, 37); this.tbManager.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -851,6 +857,7 @@ // tbAdmin // this.tbAdmin.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbAdmin.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbAdmin.Name = "tbAdmin"; this.tbAdmin.Size = new System.Drawing.Size(70, 37); this.tbAdmin.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -965,7 +972,18 @@ this.fpSpread1.TabIndex = 7; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff_1); this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted); - this.fpSpread1.SetViewportLeftColumn(0, 0, 8); + // + // label2 + // + this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(0, 606); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label2.Size = new System.Drawing.Size(1226, 23); + this.label2.TabIndex = 8; + this.label2.Text = "--"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // fpSpread1_Sheet1 // @@ -1075,6 +1093,7 @@ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Tag = "place"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; @@ -1314,18 +1333,6 @@ this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.Location = new System.Drawing.Point(0, 606); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label2.Size = new System.Drawing.Size(1226, 23); - this.label2.TabIndex = 8; - this.label2.Text = "--"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchaseCR // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1443,7 +1450,6 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripTextBox tbAdmin; private System.Windows.Forms.ToolStripButton toolStripButton8; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem; @@ -1452,5 +1458,6 @@ private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem6; private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index 570ddd9..1835af4 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -104,6 +104,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.cmDate.SelectedIndex = 0; this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK; this.cmbSort.SelectedIndex = 0; @@ -289,6 +290,8 @@ namespace FEQ0000 var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index; var prjindex = this.fpSpread1.ActiveSheet.Columns["projectidx"].Index; var cstsindex = this.fpSpread1.ActiveSheet.Columns["conf_status"].Index; + var nameindex = this.fpSpread1.ActiveSheet.Columns["pumname"].Index; // pumname + var placeindex = this.fpSpread1.ActiveSheet.Columns["place"].Index; // pumname for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { @@ -299,12 +302,17 @@ namespace FEQ0000 var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex); var crcf = this.fpSpread1.ActiveSheet.GetValue(i, crcfindex); var v_confstats = this.fpSpread1.ActiveSheet.GetValue(i, cstsindex); + var v_pumname = this.fpSpread1.ActiveSheet.GetValue(i, nameindex); + var v_place = this.fpSpread1.ActiveSheet.GetValue(i, placeindex); + var str_place = ""; + var str_pumname = string.Empty; var str_crcf = string.Empty; var str_confstats = string.Empty; if (crcf != null) str_crcf = crcf.ToString(); if (v_confstats != null) str_confstats = v_confstats.ToString(); - + if (v_pumname != null) str_pumname = v_pumname.ToString(); + if (v_place != null) str_place = v_place.ToString().ToUpper(); if (value != null && (Boolean)value) { @@ -333,7 +341,10 @@ namespace FEQ0000 break; case "---": case "----": - this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; + if (str_place.Contains("SPR") || str_pumname.ToUpper().Contains("SPR")) + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Violet; + else + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; break; case "received": this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; @@ -1511,7 +1522,7 @@ namespace FEQ0000 fpSpread1_Sheet1.Cells[r, statecol].Value = "PO"; } } - + } } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx index 04cc834..1912d70 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx @@ -455,7 +455,7 @@ - 579, 23 + 582, 23 65 diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 724d943..0a38dda 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -12,7 +12,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchaseCR_Add : Form + public partial class fPurchaseCR_Add : fBase { BindingSource bsManu; BindingSource bsModel; @@ -51,11 +51,11 @@ namespace FEQ0000 } - + Boolean advInput = false; private void __Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsPurchase.Purchase' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. + EnsureVisibleAndUsableSize(); //this.purchaseTableAdapter.Fill(this.dsPurchase.Purchase); // this.Show(); // Application.DoEvents(); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs index 831e20e..68c1e5b 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs @@ -43,7 +43,7 @@ namespace FEQ0000 this.dataGridView1.EditMode = DataGridViewEditMode.EditOnKeystroke; } - + private void FPurchase_FormClosing(object sender, FormClosingEventArgs e) { if (dsPurchase.HasChanges()) @@ -89,7 +89,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchaseEB)); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs index f2c8ab4..c17dd1f 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fPurchaseCR_Ipgo : Form + public partial class fPurchaseCR_Ipgo : fBase { int idx = -1; string po = string.Empty; @@ -25,11 +26,12 @@ namespace FEQ0000.Purchase if (e1.KeyCode == Keys.Escape) this.Close(); }; } - + string prestatus = "PO"; private void fPurchaseCR_Ipgo_Load(object sender, EventArgs e) { //담당자목록 + EnsureVisibleAndUsableSize(); var ta = new dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); var dt = ta.GetByIdx(this.idx); if (dt == null || dt.Any() == false) diff --git a/SubProject/FEQ0000/PurchaseCR/rPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/rPurchaseCR.cs index aca2736..528e5cd 100644 --- a/SubProject/FEQ0000/PurchaseCR/rPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/rPurchaseCR.cs @@ -20,6 +20,7 @@ namespace FEQ0000.Purchase private void rPurchase_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; this.dtED.Text = DateTime.Now.Year.ToString("0000") + "-12-31"; @@ -30,6 +31,23 @@ namespace FEQ0000.Purchase //refreshData(); } + private void EnsureVisibleAndUsableSize() + { + var visibleBounds = Screen.GetWorkingArea(this); + var isOutOfView = (Left > visibleBounds.Right) || (Top > visibleBounds.Bottom) || + (Right < visibleBounds.Left) || (Bottom < visibleBounds.Top); + if (isOutOfView) + { + CenterToScreen(); + } + var minW = Math.Max(320, this.MinimumSize.Width); + var minH = Math.Max(240, this.MinimumSize.Height); + + if (Width < minW || Height < minH) + { + this.Size = new Size(minW, minH); + } + } private void btSearch_Click(object sender, EventArgs e) { diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index f752cbb..e75c9f0 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -106,9 +106,10 @@ namespace FEQ0000 e.Row["receive"] = "";// FCOMMON.info.Login.nameK; e.Row["place"] = "전자실"; } - + private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.cmDate.SelectedIndex = 0; this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK; this.cmbSort.SelectedIndex = 0; @@ -1020,275 +1021,6 @@ namespace FEQ0000 } - //string MakeDataTableToHTML(string savefilenamexls = "") - //{ - - // libxl.Book book = null;// = new libxl.BinBook(); - // libxl.Sheet sheet = null; - - - // libxl.Format fTitle = null; - // libxl.Format fDataStr = null; - // libxl.Format fDataNum = null; - - // if (savefilenamexls.isEmpty() == false) - // { - // book = new libxl.XmlBook(); - // book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); - // sheet = book.addSheet("Data"); - - // fTitle = book.addFormat(); - // fDataStr = book.addFormat(); - // fDataNum = book.addFormat(); - - // fDataStr.alignH = libxl.AlignH.ALIGNH_CENTER; - // fDataStr.alignV = libxl.AlignV.ALIGNV_CENTER; - // fDataStr.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); - // fDataStr.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; - // fDataStr.patternForegroundColor = libxl.Color.COLOR_WHITE; - - // fTitle.alignV = libxl.AlignV.ALIGNV_CENTER; - // fTitle.alignH = libxl.AlignH.ALIGNH_CENTER; - // fTitle.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); - // fTitle.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; - // fTitle.patternForegroundColor = libxl.Color.COLOR_GRAY25; - - // fDataNum.alignH = libxl.AlignH.ALIGNH_GENERAL; - // fDataNum.alignV = libxl.AlignV.ALIGNV_CENTER; - // fDataNum.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); - // fDataNum.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; - // fDataNum.patternForegroundColor = libxl.Color.COLOR_WHITE; - - // } - - // //목록을 본문에 추가한다 - // System.Text.StringBuilder sb = new StringBuilder(); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - - // var row = 0; - // var col = 0; - // if (sheet != null) - // { - // var basewidth = 15; - // sheet.setRow(row, 30); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "S/C", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "자재번호", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "청구자", fTitle); - // sheet.setCol(col, (int)(basewidth * 2)); sheet.writeStr(row, col++, "품목", fTitle); - // sheet.setCol(col, (int)(basewidth * 3)); sheet.writeStr(row, col++, "규격", fTitle); - // sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "수량", fTitle); - // sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "단가", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "금액", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "공급업체", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "용도", fTitle); - // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "요청부서", fTitle); - - // } - - - - // var col_신청일 = fpSpread1_Sheet1.Columns["pdate"].Index; - // var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index; - // var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index; - - // var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index; - // var col_SID = fpSpread1_Sheet1.Columns["sid"].Index; - // var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index; - // var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index; - // var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index; - // var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index; - // var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index; - // var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index; - // var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index; - - // var col_site = fpSpread1_Sheet1.Columns["site"].Index; - // var col_분류 = fpSpread1_Sheet1.Columns["분류"].Index; - // var col_sc = fpSpread1_Sheet1.Columns["sc"].Index; - - // int totalamt = 0; - // row = 1; - // col = 0; - // for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++) - // { - // var v신청일 = fpSpread1_Sheet1.Cells[i, col_신청일].Value; - // var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value; - // var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value; - - // var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value; - // var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value; - // var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value; - // var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value; - // var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value; - // var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value; - // var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value; - // var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value; - // var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value; - - // var vSITE = fpSpread1_Sheet1.Cells[i, col_site].Value; - // var v분류 = fpSpread1_Sheet1.Cells[i, col_분류].Value; - // var vsc = fpSpread1_Sheet1.Cells[i, col_sc].Value; - - // var s신청일 = String.Empty; - // var s요청 = String.Empty; - // var sCRCF = String.Empty; - // var s수령 = String.Empty; - // var sSID = String.Empty; - // var s품명 = String.Empty; - // var s규격 = String.Empty; - // var s수량 = "0"; - // var s단가 = "0"; - // var s금액 = "0"; - // var s입고 = String.Empty; - // var s공급 = String.Empty; - // var s비고 = String.Empty; - // var sSTIE = string.Empty; - // var s분류 = string.Empty; - // var sSC = string.Empty; - - // if (v신청일 != null) s신청일 = v신청일.ToString(); - // if (v요청 != null) s요청 = v요청.ToString(); - // if (vCRCF != null) sCRCF = vCRCF.ToString(); - // if (v수령 != null) s수령 = v수령.ToString(); - // if (vSID != null) sSID = vSID.ToString(); - // if (v품명 != null) s품명 = v품명.ToString(); - // if (v규격 != null) s규격 = v규격.ToString(); - // if (v수량 != null) s수량 = v수량.ToString(); - // if (v단가 != null) s단가 = v단가.ToString(); - // if (v금액 != null) s금액 = v금액.ToString(); - // if (v공급 != null) s공급 = v공급.ToString(); - // if (vSITE != null) sSTIE = vSITE.ToString(); - // if (v분류 != null) s분류 = v분류.ToString(); - // if (vsc != null) sSC = vsc.ToString(); - - - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - - - // var qty = int.Parse(s수량); - // var price = int.Parse(s단가); - // var amt = int.Parse(s금액); - // totalamt += amt; - - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - - // if (sheet != null) - // { - // col = 0; - // sheet.setRow(row, 23); - // sheet.writeStr(row, col++, sSC, fDataStr); - // sheet.writeStr(row, col++, sSID, fDataStr); - // sheet.writeStr(row, col++, s요청, fDataStr); - // sheet.writeStr(row, col++, s품명, fDataStr); - // sheet.writeStr(row, col++, s규격, fDataStr); - // sheet.writeNum(row, col++, qty, fDataNum); - // sheet.writeNum(row, col++, price, fDataNum); - // sheet.writeNum(row, col++, amt, fDataNum); - // sheet.writeStr(row, col++, s공급, fDataStr); - // sheet.writeStr(row, col++, s비고, fDataStr); - // sheet.writeStr(row, col++, "전자실", fDataStr); - // row += 1; - // } - - // ////sb.AppendLine(""); - // //''sb.AppendLine(""); - // //sb.AppendLine(""); - // //sb.AppendLine(""); - - - - // sb.AppendLine(""); - // } - - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - // sb.AppendLine(""); - - // sb.AppendLine(""); - // sb.AppendLine("
      TOTAL{금액} 
SC자재번호청구자품목규격수량단가금액공급업체용도요청부서
SC자재번호청구자품목규격수량단가금액공급업체요청부서
" + getmaxstr(sSC) + "" + getmaxstr(sSID) + "" + getmaxstr(s요청) + "" + getmaxstr(s품명) + "" + getmaxstr(s규격) + "" + qty.ToString("N0") + "" + price.ToString("N0") + "" + amt.ToString("N0") + "" + getmaxstr(s공급) + "" + s비고 + "전자실" + getmaxstr(sSTIE) + "" + getmaxstr(s분류) + "" + getmaxstr(sCRCF) + "" + getmaxstr(s수령) + "
      TOTAL{금액} 
"); - - - // if (sheet != null) - // { - // col = 0; - // sheet.setRow(row, 30); - // sheet.writeStr(row, col++, "합계", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeStr(row, col++, "", fTitle); - // sheet.writeNum(row, col++, totalamt, fTitle); - // sheet.setMerge(row, row, col - 1, col + 2); - // row += 1; - // } - - - // if (book != null) - // { - // try - // { - // book.save(savefilenamexls); - // } - // catch { } - // } - // return sb.ToString().Replace("{금액}", totalamt.ToString("N0")); - //} - - private void toolStripButton3_Click_1(object sender, EventArgs e) { diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEBList.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEBList.cs index 972c4bf..2942819 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEBList.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEBList.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchaseEBList : Form + public partial class fPurchaseEBList : fBase { public fPurchaseEBList(dsPurchase.EETGW_PurchaseEBDataTable dt) { @@ -24,7 +25,7 @@ namespace FEQ0000 private void fEBoardReport_Load(object sender, EventArgs e) { - //기본엑셀파일을 가져온다 + EnsureVisibleAndUsableSize(); this.Show(); this.bs1.Sort = "sc,sid,pumname"; this.bs1.Filter = "sc <> ''"; diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index ceb49a7..0435d86 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchaseEB_Add : Form + public partial class fPurchaseEB_Add : fBase { BindingSource bsManu; BindingSource bsModel; @@ -89,7 +89,7 @@ namespace FEQ0000 //Boolean advInput = false; private void __Load(object sender, EventArgs e) { - //advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); + EnsureVisibleAndUsableSize(); tbPumName.ImeMode = ImeMode.Alpha; //상태 diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs index 27d15fc..88b40ad 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs @@ -83,7 +83,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchaseEB)); IsAdmin = curLevel >= 5; diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs index 345599b..c261861 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fPurchaseEB_Ipgo : Form + public partial class fPurchaseEB_Ipgo : fBase { int idx = -1; string po = string.Empty; @@ -28,7 +29,7 @@ namespace FEQ0000.Purchase string prestatus = "PO"; private void fPurchaseCR_Ipgo_Load(object sender, EventArgs e) { - //담당자목록 + EnsureVisibleAndUsableSize(); var ta = new dsPurchaseTableAdapters.PurchaseTableAdapter(); var dt = ta.GetByIdx(this.idx); if (dt == null || dt.Any() == false) diff --git a/SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs index de7398a..0e9d8fe 100644 --- a/SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/rPurchaseEB.cs @@ -1,4 +1,6 @@ -using System; +using FarPoint.Win.Spread.CellType; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class rPurchaseEB : Form + public partial class rPurchaseEB : fBase { public rPurchaseEB() { @@ -20,6 +22,7 @@ namespace FEQ0000.Purchase private void rPurchase_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; this.dtED.Text = DateTime.Now.Year.ToString("0000") + "-12-31"; diff --git a/SubProject/FEQ0000/PurchaseNR/fInputSC.cs b/SubProject/FEQ0000/PurchaseNR/fInputSC.cs index e07ed6a..72ba82c 100644 --- a/SubProject/FEQ0000/PurchaseNR/fInputSC.cs +++ b/SubProject/FEQ0000/PurchaseNR/fInputSC.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fInputSC : Form + public partial class fInputSC : fBase { public fInputSC() { @@ -18,5 +19,10 @@ namespace FEQ0000.Purchase Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } } } diff --git a/SubProject/FEQ0000/PurchaseNR/fMailForm.cs b/SubProject/FEQ0000/PurchaseNR/fMailForm.cs index 29b19c0..d5c0114 100644 --- a/SubProject/FEQ0000/PurchaseNR/fMailForm.cs +++ b/SubProject/FEQ0000/PurchaseNR/fMailForm.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -11,7 +12,7 @@ using YARTE.UI.Buttons; namespace FEQ0000.Purchase { - public partial class fMailForm : Form + public partial class fMailForm : fBase { string Cate = string.Empty; public fMailForm(string cate) @@ -37,6 +38,7 @@ namespace FEQ0000.Purchase private void fMailForm_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); if (Cate.isEmpty() == false) { var db = new DataClasses1DataContext(); diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs index aa045df..de1d5a8 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs @@ -158,9 +158,9 @@ this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -937,6 +937,30 @@ this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted); this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 639); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1334, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(0, 616); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label2.Size = new System.Drawing.Size(1334, 23); + this.label2.TabIndex = 7; + this.label2.Text = "--"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -1026,6 +1050,7 @@ this.fpSpread1_Sheet1.Columns.Get(5).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "보관소"; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "place"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; @@ -1300,30 +1325,6 @@ this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 639); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1334, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.Location = new System.Drawing.Point(0, 616); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label2.Size = new System.Drawing.Size(1334, 23); - this.label2.TabIndex = 7; - this.label2.Text = "--"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchaseNR // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1438,7 +1439,6 @@ private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 사용자내보내기ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton8; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 현재목록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록ToolStripMenuItem; @@ -1447,5 +1447,6 @@ private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs index 95f82ea..c8a422f 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs @@ -24,7 +24,7 @@ using System.Data.SqlClient; namespace FEQ0000 { - public partial class fPurchaseNR : FCOMMON.fBase + public partial class fPurchaseNR : fBase { string fn_fpcolsize = ""; @@ -112,6 +112,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.cmDate.SelectedIndex = 0; this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK; this.cmbSort.SelectedIndex = 0; @@ -315,6 +316,8 @@ namespace FEQ0000 var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index; var prjindex = this.fpSpread1.ActiveSheet.Columns["projectidx"].Index; var cstsindex = this.fpSpread1.ActiveSheet.Columns["conf_status"].Index; + var nameindex = this.fpSpread1.ActiveSheet.Columns["pumname"].Index; // pumname + var placeindex = this.fpSpread1.ActiveSheet.Columns["place"].Index; // pumname for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { @@ -325,13 +328,17 @@ namespace FEQ0000 var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex); var crcf = this.fpSpread1.ActiveSheet.GetValue(i, crcfindex); var v_confstats = this.fpSpread1.ActiveSheet.GetValue(i, cstsindex); + var v_pumname = this.fpSpread1.ActiveSheet.GetValue(i, nameindex); + var v_place = this.fpSpread1.ActiveSheet.GetValue(i, placeindex); - + var str_place = ""; + var str_pumname = string.Empty; var str_crcf = string.Empty; var str_confstats = string.Empty; if (crcf != null) str_crcf = crcf.ToString(); if (v_confstats != null) str_confstats = v_confstats.ToString(); - + if (v_pumname != null) str_pumname = v_pumname.ToString(); + if (v_place != null) str_place = v_place.ToString().ToUpper(); if (value != null && (Boolean)value) { @@ -360,7 +367,10 @@ namespace FEQ0000 break; case "---": case "----": - this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; + if (str_place.Contains("SPR") || str_pumname.ToUpper().Contains("SPR")) + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Violet; + else + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; break; case "received": this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; @@ -1204,7 +1214,7 @@ namespace FEQ0000 { var drv = this.bs.Current as DataRowView; var dr = drv.Row as dsPurchase.PurchaseRow; - if(dr.state == "PR" && dr.po.isEmpty()==false) + if (dr.state == "PR" && dr.po.isEmpty() == false) { dr.state = "PO"; } @@ -1588,7 +1598,7 @@ namespace FEQ0000 //if ((cnt) % 10 == 0) { this.Text = $"품목업데이트 수량(I:{cntI}/U:{cntU})"; - + } System.Windows.Forms.Application.DoEvents(); System.Threading.Thread.Sleep(500); diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx index bcf769c..0fe192b 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx @@ -455,7 +455,7 @@ - 579, 23 + 582, 23 65 diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs index 6dbdb0e..caaee9f 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchaseNRList : Form + public partial class fPurchaseNRList : fBase { public fPurchaseNRList(dsPurchase.PurchaseDataTable dt) { @@ -24,6 +25,7 @@ namespace FEQ0000 private void fEBoardReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //기본엑셀파일을 가져온다 this.Show(); this.bs1.Sort = "sc,sid,pumname"; diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs index 0af6a51..6c9cf43 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs @@ -89,7 +89,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); IsAdmin = curLevel >= 5; diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs index c7ffd7b..4517557 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fPurchaseNR_Ipgo : Form + public partial class fPurchaseNR_Ipgo : fBase { int idx = -1; string po = string.Empty; @@ -29,7 +30,7 @@ namespace FEQ0000.Purchase string prestatus = "PO"; private void fPurchaseCR_Ipgo_Load(object sender, EventArgs e) { - //담당자목록 + EnsureVisibleAndUsableSize(); var ta = new dsPurchaseTableAdapters.PurchaseTableAdapter(); var dt = ta.GetByIdx(this.idx); if (dt == null || dt.Any() == false) diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index 0d34535..eaba558 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_Add : Form + public partial class fPurchase_Add : fBase { BindingSource bsManu; BindingSource bsModel; @@ -83,6 +83,7 @@ namespace FEQ0000 Boolean advInput = false; private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); tbPumName.ImeMode = ImeMode.Alpha; diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs index 369f668..7042acc 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_AddS : Form + public partial class fPurchase_AddS : fBase { BindingSource bsManu; BindingSource bsModel; @@ -47,7 +48,7 @@ namespace FEQ0000 //Boolean advInput = false; private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); this.cmbState.DisplayMember = "Value"; diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs index 0d59885..c38ab4a 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_Data : Form + public partial class fPurchase_Data : fBase { public fPurchase_Data() { @@ -17,6 +18,11 @@ namespace FEQ0000 Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void button1_Click(object sender, EventArgs e) { diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs index 02ec841..7d3baeb 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_Import : Form + public partial class fPurchase_Import : fBase { DataTable dt = new dsPurchase.PurchaseDataTable(); DataTable dtExcel = new DataTable(); @@ -23,6 +24,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.sd.Value = DateTime.Now.AddMonths(-1); this.ed.Value = DateTime.Now; } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs index dd78072..2473611 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_ImportO : Form + public partial class fPurchase_ImportO : fBase { DataTable dt = new dsPurchase.PurchaseDataTable(); DataTable dtExcel = new DataTable(); @@ -23,7 +24,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { - //this.sd.Value = DateTime.Now.AddMonths(-1); + EnsureVisibleAndUsableSize(); this.dtPdate.Value = DateTime.Now; } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs index 37e1b5a..39f40b2 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs @@ -12,7 +12,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fPurchase_excelimport : Form + public partial class fPurchase_excelimport : fBase { BindingSource bsModel; eImporttype crmode; @@ -76,6 +76,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); this.cmbState.DisplayMember = "Value"; diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs index dc9dd63..b073dfd 100644 --- a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class fSIDCheckNR : Form + public partial class fSIDCheckNR : fBase { public List chklist = new List(); public fSIDCheckNR(List items) @@ -111,6 +112,7 @@ namespace FEQ0000.Purchase private void fSIDCheckNR_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); dv1.AutoResizeColumns(); } diff --git a/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs index ae0ab09..e4349bd 100644 --- a/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace FEQ0000.Purchase { - public partial class rPurchaseNR : Form + public partial class rPurchaseNR : FCOMMON.fBase { public rPurchaseNR() { @@ -20,6 +20,7 @@ namespace FEQ0000.Purchase private void rPurchase_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; this.dtED.Text = DateTime.Now.Year.ToString("0000") + "-12-31"; diff --git a/SubProject/FEQ0000/fColumnFilter.cs b/SubProject/FEQ0000/fColumnFilter.cs index a7a950c..17cdf9e 100644 --- a/SubProject/FEQ0000/fColumnFilter.cs +++ b/SubProject/FEQ0000/fColumnFilter.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FEQ0000 { - public partial class fColumnFilter : Form + public partial class fColumnFilter : fBase { public fColumnFilter(string col) { @@ -20,6 +21,7 @@ namespace FEQ0000 private void fColumnFilter_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); comboBox1.SelectedIndex = 0; this.Show(); textBox1.ImeMode = ImeMode.Hangul; diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index ed33a5e..7c24999 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/SubProject/FEQ0000/fItemin.cs @@ -12,10 +12,11 @@ using NetOffice; using Outlook = NetOffice.OutlookApi; using NetOffice.OutlookApi.Enums; using System.Security.Cryptography.X509Certificates; +using FCOMMON; namespace FEQ0000 { - public partial class fItemin : Form + public partial class fItemin : fBase { public fItemin() { @@ -186,7 +187,7 @@ namespace FEQ0000 private void fItemin_Load(object sender, EventArgs e) { - //구매담당자목록 + EnsureVisibleAndUsableSize(); using (var tauser = new dsPurchaseTableAdapters.Purchase_ManagerlistTableAdapter()) { var lst_man = tauser.GetByManager(FCOMMON.info.Login.gcode); diff --git a/SubProject/FEQ0000/fPurchaseConfirm.cs b/SubProject/FEQ0000/fPurchaseConfirm.cs index bc6b596..0958a8c 100644 --- a/SubProject/FEQ0000/fPurchaseConfirm.cs +++ b/SubProject/FEQ0000/fPurchaseConfirm.cs @@ -93,7 +93,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); IsAdmin = curLevel >= 5; diff --git a/SubProject/FEQ0000/fUserExportColumn.cs b/SubProject/FEQ0000/fUserExportColumn.cs index f46fa24..3a92705 100644 --- a/SubProject/FEQ0000/fUserExportColumn.cs +++ b/SubProject/FEQ0000/fUserExportColumn.cs @@ -25,7 +25,7 @@ using FarPoint.Excel; namespace FEQ0000 { - public partial class fUserExportColumn : Form + public partial class fUserExportColumn : fBase { string presavefn = ""; //this.Name, cols,this.dsPurchase.Purchase,this.bs.Filter @@ -129,6 +129,7 @@ namespace FEQ0000 private void fUserExportColumn_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); button3.PerformClick(); } diff --git a/SubProject/FPJ0000/.vs/FPJ0000.csproj.dtbcache.json b/SubProject/FPJ0000/.vs/FPJ0000.csproj.dtbcache.json new file mode 100644 index 0000000..1d0b406 --- /dev/null +++ b/SubProject/FPJ0000/.vs/FPJ0000.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FPJ0000","ProjectFileName":"FPJ0000.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Auth.cs"},{"SourceFile":"Common.cs"},{"SourceFile":"DataBaseManager.cs"},{"SourceFile":"DSComm.Designer.cs"},{"SourceFile":"DSEboard.Designer.cs"},{"SourceFile":"dsJobReport.Designer.cs"},{"SourceFile":"DSKuntae.Designer.cs"},{"SourceFile":"dsMail.Designer.cs"},{"SourceFile":"DSNote.Designer.cs"},{"SourceFile":"dsPRJ.cs"},{"SourceFile":"dsPRJ.Designer.cs"},{"SourceFile":"dsPurchase.Designer.cs"},{"SourceFile":"dsQuery.Designer.cs"},{"SourceFile":"dsReport.cs"},{"SourceFile":"dsReport.Designer.cs"},{"SourceFile":"EBoard\\fEboardData.cs"},{"SourceFile":"EBoard\\fEboardData.Designer.cs"},{"SourceFile":"EBoard\\fEBoardImport.cs"},{"SourceFile":"EBoard\\fEBoardImport.Designer.cs"},{"SourceFile":"EBoard\\fEboardList.cs"},{"SourceFile":"EBoard\\fEboardList.Designer.cs"},{"SourceFile":"EBoard\\fEBoardReport.cs"},{"SourceFile":"EBoard\\fEBoardReport.Designer.cs"},{"SourceFile":"EETGW_DocuForm.cs"},{"SourceFile":"EETGW_HolydayRequest.cs"},{"SourceFile":"EETGW_JobReport_EBoard.cs"},{"SourceFile":"EETGW_Note.cs"},{"SourceFile":"EETGW_ProjectsSchedule.cs"},{"SourceFile":"EETGW_Project_Layout.cs"},{"SourceFile":"EETGW_SaveCost.cs"},{"SourceFile":"fHistAddDay.cs"},{"SourceFile":"fHistAddDay.Designer.cs"},{"SourceFile":"fHistAdd.cs"},{"SourceFile":"fHistAdd.Designer.cs"},{"SourceFile":"fMailSend.cs"},{"SourceFile":"fMailSend.Designer.cs"},{"SourceFile":"fMailList.cs"},{"SourceFile":"fMailList.Designer.cs"},{"SourceFile":"GantChart.cs"},{"SourceFile":"GantChart.Designer.cs"},{"SourceFile":"HolidayLIst.cs"},{"SourceFile":"JobReport.cs"},{"SourceFile":"JobReport_\\fJobChartMenu.cs"},{"SourceFile":"JobReport_\\fJobChartMenu.Designer.cs"},{"SourceFile":"JobReport_\\fProjectConnect.cs"},{"SourceFile":"JobReport_\\fProjectConnect.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportType.cs"},{"SourceFile":"JobReport_\\rJobReportType.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportPrjSche.cs"},{"SourceFile":"JobReport_\\rJobReportPrjSche.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportPrj.cs"},{"SourceFile":"JobReport_\\rJobReportPrj.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportOT.cs"},{"SourceFile":"JobReport_\\rJobReportOT.Designer.cs"},{"SourceFile":"OtConfirm\\fHolyRequest.cs"},{"SourceFile":"OtConfirm\\fHolyRequest.Designer.cs"},{"SourceFile":"OtConfirm\\fOTConfirmOK.cs"},{"SourceFile":"OtConfirm\\fOTConfirmOK.Designer.cs"},{"SourceFile":"OtConfirm\\fHolyRequestAdd.cs"},{"SourceFile":"OtConfirm\\fHolyRequestAdd.Designer.cs"},{"SourceFile":"OtConfirm\\fOTConfirm.cs"},{"SourceFile":"OtConfirm\\fOTConfirm.Designer.cs"},{"SourceFile":"JobReport_\\fJobReportAI.cs"},{"SourceFile":"JobReport_\\fJobReportAI.Designer.cs"},{"SourceFile":"JobReport_\\fJobReport_AddAI.cs"},{"SourceFile":"JobReport_\\fJobReport_AddAI.Designer.cs"},{"SourceFile":"JobReport_\\fSelectProcess.cs"},{"SourceFile":"JobReport_\\fSelectProcess.Designer.cs"},{"SourceFile":"JobReport_\\rK5Dailyform.cs"},{"SourceFile":"JobReport_\\rK5Dailyform.Designer.cs"},{"SourceFile":"JobReport_\\rJobChart.cs"},{"SourceFile":"JobReport_\\rJobChart.Designer.cs"},{"SourceFile":"JobReport_\\K5Dailyform.cs"},{"SourceFile":"JobReport_\\K5Dailyform.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportUser.cs"},{"SourceFile":"JobReport_\\rJobReportUser.Designer.cs"},{"SourceFile":"MailData.cs"},{"SourceFile":"MailForm.cs"},{"SourceFile":"Model1.Context.cs"},{"SourceFile":"Model1.cs"},{"SourceFile":"Model1.Designer.cs"},{"SourceFile":"Note\\fNote.cs"},{"SourceFile":"Note\\fNote.Designer.cs"},{"SourceFile":"OtConfirm\\fOTConfirmValue.cs"},{"SourceFile":"OtConfirm\\fOTConfirmValue.Designer.cs"},{"SourceFile":"OtConfirm\\fOutCoomplete.cs"},{"SourceFile":"OtConfirm\\fOutCoomplete.Designer.cs"},{"SourceFile":"Projects.cs"},{"SourceFile":"Project\\ctlLayout.cs"},{"SourceFile":"Project\\ctlLayout.Designer.cs"},{"SourceFile":"Project\\DSProjectSummary.Designer.cs"},{"SourceFile":"Project\\fLayoutEdit.cs"},{"SourceFile":"Project\\fLayoutEdit.Designer.cs"},{"SourceFile":"Project\\fProjectLayout.cs"},{"SourceFile":"Project\\fProjectLayout.Designer.cs"},{"SourceFile":"Project\\fProjectListU.cs"},{"SourceFile":"Project\\fProjectListU.Designer.cs"},{"SourceFile":"Project\\fProjectListUserDetail.cs"},{"SourceFile":"Project\\fProjectListUserDetail.Designer.cs"},{"SourceFile":"Project\\fProjectListUser.cs"},{"SourceFile":"Project\\fProjectListUser.Designer.cs"},{"SourceFile":"Project\\fProjectPartToPurchaseCR.cs"},{"SourceFile":"Project\\fProjectPartToPurchaseCR.Designer.cs"},{"SourceFile":"Project\\fProjectSummary.cs"},{"SourceFile":"Project\\fProjectSummary.Designer.cs"},{"SourceFile":"Project\\fProjectPartListEdit.cs"},{"SourceFile":"Project\\fProjectPartListEdit.Designer.cs"},{"SourceFile":"Purchase.cs"},{"SourceFile":"SaveCost\\fSaveCostReport.cs"},{"SourceFile":"SaveCost\\fSaveCostReport.Designer.cs"},{"SourceFile":"SaveCost\\fSaveCostData.cs"},{"SourceFile":"SaveCost\\fSaveCostData.Designer.cs"},{"SourceFile":"SaveCost\\fSaveCostList.cs"},{"SourceFile":"SaveCost\\fSaveCostList.Designer.cs"},{"SourceFile":"Note\\fTextEditor.cs"},{"SourceFile":"Note\\fTextEditor.Designer.cs"},{"SourceFile":"Note\\fNote_Add.cs"},{"SourceFile":"Note\\fNote_Add.Designer.cs"},{"SourceFile":"Project\\fPartList.cs"},{"SourceFile":"Project\\fPartList.Designer.cs"},{"SourceFile":"Project\\fProejctHistory.cs"},{"SourceFile":"Project\\fProejctHistory.Designer.cs"},{"SourceFile":"Project\\fProjectData.cs"},{"SourceFile":"Project\\fProjectData.Designer.cs"},{"SourceFile":"Project\\fProjectIOMap.cs"},{"SourceFile":"Project\\fProjectIOMap.Designer.cs"},{"SourceFile":"Project\\fSCCheck.cs"},{"SourceFile":"Project\\fSCCheck.Designer.cs"},{"SourceFile":"Project\\fProjectSchedule.cs"},{"SourceFile":"Project\\fProjectSchedule.Designer.cs"},{"SourceFile":"ImportC.cs"},{"SourceFile":"ImportC.Designer.cs"},{"SourceFile":"Import.cs"},{"SourceFile":"Import.Designer.cs"},{"SourceFile":"JobReport_\\fJobReport.cs"},{"SourceFile":"JobReport_\\fJobReport.Designer.cs"},{"SourceFile":"Project\\fProjectList.cs"},{"SourceFile":"Project\\fProjectList.Designer.cs"},{"SourceFile":"FPUtil.cs"},{"SourceFile":"Project\\rPartList.cs"},{"SourceFile":"Project\\rPartList.Designer.cs"},{"SourceFile":"JobReport_\\fJobReport_Add.cs"},{"SourceFile":"JobReport_\\fJobReport_Add.Designer.cs"},{"SourceFile":"JobReport_\\fJobReportImport.cs"},{"SourceFile":"JobReport_\\fJobReportImport.Designer.cs"},{"SourceFile":"JobReport_\\fLovProject.cs"},{"SourceFile":"JobReport_\\fLovProject.Designer.cs"},{"SourceFile":"JobReport_\\rJobReportDay.cs"},{"SourceFile":"JobReport_\\rJobReportDay.Designer.cs"},{"SourceFile":"JobReport_\\rJobReport.cs"},{"SourceFile":"JobReport_\\rJobReport.Designer.cs"},{"SourceFile":"MethodExtentions.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Project\\fProjectPartImport.cs"},{"SourceFile":"Project\\fProjectPartImport.Designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SqlServerTypes\\Loader.cs"},{"SourceFile":"UserGroup.cs"},{"SourceFile":"Users.cs"},{"SourceFile":"Util.cs"},{"SourceFile":"vEETGW_Project_LayoutList.cs"},{"SourceFile":"vGroupUser.cs"},{"SourceFile":"vHoliday_uselist.cs"},{"SourceFile":"vJobReportForUser.cs"},{"SourceFile":"vUserWorkTimeList.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\AmkorRestfulService\\bin\\debug\\AmkorRestfulService.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\arCtl\\bin\\debug\\arControl.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\ArSetting.Net4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\EntityFramework.6.2.0\\lib\\net40\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\EntityFramework.6.2.0\\lib\\net40\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Excel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Localization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PDF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.PluginCalendar.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Chart.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\FarPoint.Win.Spread.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCM0000\\bin\\debug\\FCM0000.exe","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FCOMMON\\bin\\Debug\\FCOMMON.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.CalcEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Spreadsheet.Win.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\GrapeCity\\Spread.NET 11\\Windows Forms\\v11.40.20177.0\\bin\\GrapeCity.Win.PluginInputMan.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\DLL\\libxl.net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.ProcessingObjectModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1586.0\\lib\\net40\\Microsoft.ReportViewer.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\NetOffice.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetSpell.2.1.7\\lib\\NetSpell.SpellChecker.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\OfficeApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Outlook.1.8.1\\lib\\net40\\OutlookApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\RichTextBoxEx.1.0.0\\lib\\PrintRichTextBox.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\RichTextBoxEx.1.0.0\\lib\\RichTextBoxEx.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\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.6\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\CMSControl\\obj\\Debug\\UMSControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\packages\\NetOfficeFw.Core.1.8.1\\lib\\net40\\VBIDEApi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FPJ0000\\bin\\Debug\\FPJ0000.exe","OutputItemRelativePath":"FPJ0000.exe"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014) GroupWare\\Source\\SubProject\\FPJ0000\\bin\\Debug\\FPJ0000.pdb","OutputItemRelativePath":"FPJ0000.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/FPJ0000/DSKuntae.Designer.cs b/SubProject/FPJ0000/DSKuntae.Designer.cs index a5c5c15..f7428ec 100644 --- a/SubProject/FPJ0000/DSKuntae.Designer.cs +++ b/SubProject/FPJ0000/DSKuntae.Designer.cs @@ -327,6 +327,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnetime; + private global::System.Data.DataColumn columnconf_id; + + private global::System.Data.DataColumn columnconf_time; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public EETGW_HolydayRequestDataTable() { @@ -552,6 +556,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn conf_idColumn { + get { + return this.columnconf_id; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn conf_timeColumn { + get { + return this.columnconf_time; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -612,7 +632,9 @@ namespace FPJ0000 { double HolyTimes, bool sendmail, string stime, - string etime) { + string etime, + string conf_id, + System.DateTime conf_time) { EETGW_HolydayRequestRow rowEETGW_HolydayRequestRow = ((EETGW_HolydayRequestRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -638,7 +660,9 @@ namespace FPJ0000 { HolyTimes, sendmail, stime, - etime}; + etime, + conf_id, + conf_time}; rowEETGW_HolydayRequestRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_HolydayRequestRow); return rowEETGW_HolydayRequestRow; @@ -692,6 +716,8 @@ namespace FPJ0000 { this.columnsendmail = base.Columns["sendmail"]; this.columnstime = base.Columns["stime"]; this.columnetime = base.Columns["etime"]; + this.columnconf_id = base.Columns["conf_id"]; + this.columnconf_time = base.Columns["conf_time"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -745,6 +771,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnstime); this.columnetime = new global::System.Data.DataColumn("etime", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnetime); + this.columnconf_id = new global::System.Data.DataColumn("conf_id", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnconf_id); + this.columnconf_time = new global::System.Data.DataColumn("conf_time", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnconf_time); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -775,6 +805,7 @@ namespace FPJ0000 { this.columnHolyLocation.MaxLength = 100; this.columnstime.MaxLength = 10; this.columnetime.MaxLength = 10; + this.columnconf_id.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1279,6 +1310,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string conf_id { + get { + try { + return ((string)(this[this.tableEETGW_HolydayRequest.conf_idColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_HolydayRequest\' 테이블의 \'conf_id\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_HolydayRequest.conf_idColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public System.DateTime conf_time { + get { + try { + return ((global::System.DateTime)(this[this.tableEETGW_HolydayRequest.conf_timeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_HolydayRequest\' 테이블의 \'conf_time\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_HolydayRequest.conf_timeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsuidNull() { @@ -1518,6 +1581,30 @@ namespace FPJ0000 { public void SetetimeNull() { this[this.tableEETGW_HolydayRequest.etimeColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Isconf_idNull() { + return this.IsNull(this.tableEETGW_HolydayRequest.conf_idColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setconf_idNull() { + this[this.tableEETGW_HolydayRequest.conf_idColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Isconf_timeNull() { + return this.IsNull(this.tableEETGW_HolydayRequest.conf_timeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setconf_timeNull() { + this[this.tableEETGW_HolydayRequest.conf_timeColumn] = global::System.Convert.DBNull; + } } /// @@ -1703,6 +1790,8 @@ namespace FPJ0000.DSKuntaeTableAdapters { tableMapping.ColumnMappings.Add("sendmail", "sendmail"); tableMapping.ColumnMappings.Add("stime", "stime"); tableMapping.ColumnMappings.Add("etime", "etime"); + tableMapping.ColumnMappings.Add("conf_id", "conf_id"); + tableMapping.ColumnMappings.Add("conf_time", "conf_time"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -1712,8 +1801,8 @@ namespace FPJ0000.DSKuntaeTableAdapters { this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO EETGW_HolydayRequest - (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime) -VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime); + (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime, conf_id, conf_time) +VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime,@conf_id,@conf_time); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1734,13 +1823,15 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "conf_id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_time", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conf_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE EETGW_HolydayRequest SET gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail, stime = @stime, - etime = @etime -WHERE (idx = @Original_idx); + etime = @etime, conf_id = @conf_id, conf_time = @conf_time +WHERE (idx = @Original_idx); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = @idx) ORDER BY conf, sdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1761,6 +1852,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "conf_id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_time", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conf_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -1782,7 +1875,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW EETGW_HolydayRequest.edate, EETGW_HolydayRequest.Remark, EETGW_HolydayRequest.wuid, EETGW_HolydayRequest.wdate, vGroupUser.dept, vGroupUser.name, vGroupUser.grade, vGroupUser.tel, vGroupUser.processs, EETGW_HolydayRequest.Response, EETGW_HolydayRequest.conf, EETGW_HolydayRequest.HolyReason, EETGW_HolydayRequest.HolyBackup, EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail, EETGW_HolydayRequest.stime, - EETGW_HolydayRequest.etime + EETGW_HolydayRequest.etime, EETGW_HolydayRequest.conf_id, EETGW_HolydayRequest.conf_time FROM EETGW_HolydayRequest WITH (nolock) LEFT OUTER JOIN vGroupUser ON EETGW_HolydayRequest.uid = vGroupUser.id AND EETGW_HolydayRequest.gcode = vGroupUser.gcode WHERE (EETGW_HolydayRequest.gcode = @gcode) AND (EETGW_HolydayRequest.sdate >= @sd) AND (EETGW_HolydayRequest.sdate <= @ed) @@ -1926,7 +2019,9 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; global::System.Nullable HolyTimes, global::System.Nullable sendmail, string stime, - string etime) { + string etime, + string conf_id, + global::System.Nullable conf_time) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -2030,6 +2125,18 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; else { this.Adapter.InsertCommand.Parameters[17].Value = ((string)(etime)); } + if ((conf_id == null)) { + this.Adapter.InsertCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[18].Value = ((string)(conf_id)); + } + if ((conf_time.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[19].Value = ((System.DateTime)(conf_time.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[19].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -2069,6 +2176,8 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; global::System.Nullable sendmail, string stime, string etime, + string conf_id, + global::System.Nullable conf_time, int Original_idx, int idx) { if ((gcode == null)) { @@ -2174,8 +2283,20 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; else { this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(etime)); } - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idx)); + if ((conf_id == null)) { + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(conf_id)); + } + if ((conf_time.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(conf_time.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/DSKuntae.xsd b/SubProject/FPJ0000/DSKuntae.xsd index fc5a08e..e0ec5dc 100644 --- a/SubProject/FPJ0000/DSKuntae.xsd +++ b/SubProject/FPJ0000/DSKuntae.xsd @@ -20,30 +20,32 @@ WHERE (idx = @Original_idx) - + INSERT INTO EETGW_HolydayRequest - (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime) -VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime); + (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime, conf_id, conf_time) +VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime,@conf_id,@conf_time); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -53,7 +55,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW EETGW_HolydayRequest.edate, EETGW_HolydayRequest.Remark, EETGW_HolydayRequest.wuid, EETGW_HolydayRequest.wdate, vGroupUser.dept, vGroupUser.name, vGroupUser.grade, vGroupUser.tel, vGroupUser.processs, EETGW_HolydayRequest.Response, EETGW_HolydayRequest.conf, EETGW_HolydayRequest.HolyReason, EETGW_HolydayRequest.HolyBackup, EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail, EETGW_HolydayRequest.stime, - EETGW_HolydayRequest.etime + EETGW_HolydayRequest.etime, EETGW_HolydayRequest.conf_id, EETGW_HolydayRequest.conf_time FROM EETGW_HolydayRequest WITH (nolock) LEFT OUTER JOIN vGroupUser ON EETGW_HolydayRequest.uid = vGroupUser.id AND EETGW_HolydayRequest.gcode = vGroupUser.gcode WHERE (EETGW_HolydayRequest.gcode = @gcode) AND (EETGW_HolydayRequest.sdate >= @sd) AND (EETGW_HolydayRequest.sdate <= @ed) @@ -66,34 +68,36 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC - + UPDATE EETGW_HolydayRequest SET gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail, stime = @stime, - etime = @etime -WHERE (idx = @Original_idx); + etime = @etime, conf_id = @conf_id, conf_time = @conf_time +WHERE (idx = @Original_idx); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = @idx) ORDER BY conf, sdate DESC - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +128,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW + + @@ -132,13 +138,13 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + - + - + @@ -181,14 +187,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + - + @@ -270,6 +276,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW + + + + + + + + diff --git a/SubProject/FPJ0000/DSKuntae.xss b/SubProject/FPJ0000/DSKuntae.xss index a1c92a5..afbc3dc 100644 --- a/SubProject/FPJ0000/DSKuntae.xss +++ b/SubProject/FPJ0000/DSKuntae.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/SubProject/FPJ0000/EBoard/fEBoardImport.cs b/SubProject/FPJ0000/EBoard/fEBoardImport.cs index f1dfbc7..25db41d 100644 --- a/SubProject/FPJ0000/EBoard/fEBoardImport.cs +++ b/SubProject/FPJ0000/EBoard/fEBoardImport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fEBoardImport : Form + public partial class fEBoardImport : fBase { string setFile; dsPRJ.EETGW_JobReport_EBoardDataTable dt = new dsPRJ.EETGW_JobReport_EBoardDataTable(); @@ -23,7 +24,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //this.sd.Value = DateTime.Now.AddMonths(-1); + EnsureVisibleAndUsableSize(); this.dtPdate.Value = DateTime.Now; } diff --git a/SubProject/FPJ0000/EBoard/fEBoardReport.cs b/SubProject/FPJ0000/EBoard/fEBoardReport.cs index dc9396d..e203743 100644 --- a/SubProject/FPJ0000/EBoard/fEBoardReport.cs +++ b/SubProject/FPJ0000/EBoard/fEBoardReport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.EBoard { - public partial class fEBoardReport : Form + public partial class fEBoardReport : fBase { public fEBoardReport() { @@ -19,7 +20,7 @@ namespace FPJ0000.EBoard private void fEBoardReport_Load(object sender, EventArgs e) { - //기본엑셀파일을 가져온다 + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/EBoard/fEboardData.cs b/SubProject/FPJ0000/EBoard/fEboardData.cs index 005a6ca..5708274 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.cs @@ -41,6 +41,7 @@ namespace FPJ0000 private void fProjectData_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var db = new EEEntities(); //자동완성목록 업데이트 diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 50ba8a9..548472b 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -42,7 +42,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //프로젝트 목록을 처리함 + EnsureVisibleAndUsableSize(); this.tbRequest.Text = FCOMMON.info.Login.nameK; //this.cmbSort.SelectedIndex = 0; diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index b1e2498..b307a89 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -567,12 +567,6 @@ fProjectList.cs - - Form - - - fSPMaster.cs - Form @@ -801,9 +795,6 @@ fProjectList.cs - - fSPMaster.cs - rPartList.cs diff --git a/SubProject/FPJ0000/Import.cs b/SubProject/FPJ0000/Import.cs index 17dcfa4..840a00d 100644 --- a/SubProject/FPJ0000/Import.cs +++ b/SubProject/FPJ0000/Import.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class Import : Form + public partial class Import : fBase { DataTable dt = new dsPRJ.ProjectsDataTable(); DataTable dtExcel = new DataTable(); @@ -21,7 +22,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } void __Closed(object sender, FormClosedEventArgs e) diff --git a/SubProject/FPJ0000/ImportC.cs b/SubProject/FPJ0000/ImportC.cs index 42d98d8..d400806 100644 --- a/SubProject/FPJ0000/ImportC.cs +++ b/SubProject/FPJ0000/ImportC.cs @@ -1,306 +1,307 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FPJ0000 -{ - public partial class ImportC : Form - { - DataTable dt = new dsPRJ.ProjectsDataTable(); - DataTable dtExcel = new DataTable(); - public ImportC() - { - InitializeComponent(); - this.FormClosed += __Closed; - } - - private void __Load(object sender, EventArgs e) - { - - } - - void __Closed(object sender, FormClosedEventArgs e) - { - - } - - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - OpenFileDialog od = new OpenFileDialog(); - od.Filter = "excel|*.xlsx|all files|*.*"; - od.InitialDirectory = FCOMMON.Util.CurrentPath + "model"; - od.FilterIndex = 1; - od.RestoreDirectory = true; - if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - textBox1.Text = od.FileName; - } - - private void button1_Click(object sender, EventArgs e) - { - int ColumnNameNo = (int)numericUpDown2.Value; - if(textBox1.Text == "") - { - FCOMMON.Util.MsgE("파일을 선택하세요"); - textBox1.Focus(); - return; - } - if(!System.IO.File.Exists(textBox1.Text)) - { - FCOMMON.Util.MsgE("입력하신 파일이 존재하지 않습니다."); - textBox1.Focus(); - textBox1.SelectAll(); - return; - } - - dtExcel.Columns.Clear(); - dtExcel.Rows.Clear(); - dtExcel.AcceptChanges(); - - libxl.Book book;// = new libxl.BinBook(); - book = new libxl.XmlBook(); - book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); - try - { - book.load(textBox1.Text); - }catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - return; - } - - var sheet = book.getSheet((int)nudSheet.Value-1); - var MaxRow = sheet.lastRow(); - var MinRow = sheet.firstRow(); - - MaxRow = (int)Math.Min(MaxRow, nudE.Value-1); - MinRow = (int)Math.Max(MinRow, nudS.Value-1); - if(MinRow <= (ColumnNameNo-1)) - { - FCOMMON.Util.MsgI("시작줄을 제목줄 보다 커야 합니다. 자동으로 +1 증가합니다."); - MinRow = ColumnNameNo ; - } - - - var MaxCol = sheet.lastCol(); - var MinCol = sheet.firstCol(); - - MaxCol = (int)Math.Min(MaxCol, nudCE.Value - 1); - MinCol = (int)Math.Max(MinCol, nudCS.Value - 1); - - //제목줄을 처리한다. 181029 - List cols = new List(); - - for (int c = MinCol; c <= MaxCol; c++) - { - var strVallue = sheet.readStr(ColumnNameNo-1, c); - if (strVallue == "" ) - { - if (c == MinCol) - { - //첫줄 첫행이 빈값이면 처리하지 않는다. - FCOMMON.Util.MsgE("열 제목에 빈값이 있어 처리되지 못합니다."); - return; - } - else - { - //빈값이 나왓으므로 열 최대값을 변경해준다. - if(c < MaxCol) - { - FCOMMON.Util.MsgI("빈값으로 인해 최대 열 번호를 " + c.ToString() + "로 변경합니다"); - MaxCol = c; - break; - } - } - } - if(cols.IndexOf(strVallue) >= 0) - { - FCOMMON.Util.MsgE("동일 컬럼이 발견 됨 진행 불가 : " + strVallue); - return; - } - else - { - cols.Add(strVallue); - } - - this.dtExcel.Columns.Add(strVallue); - } - - - try{ - for (int r = MinRow; r <= MaxRow; r++) - { - DataRow dr = dtExcel.NewRow(); - - Boolean nullColumn = false; - for (int c = MinCol; c <= Math.Min(cols.Count,MaxCol); c++) - { - if (sheet.isDate(r, c)) - { - var datevalue = sheet.readNum(r, c); - int y, m, d; - y = m = d = 0; - book.dateUnpack(datevalue, ref y, ref m, ref d); - if (y >= 2000) - dr[cols[c]] = string.Format("{0:0000}-{1:00}-{2:00}", y, m, d); - else - dr[cols[c]] = string.Empty; - - //일자가 만약 넘어서면 패스한다. - if(cols[c]=="일자" ) - { - string value = dr[cols[c]].ToString(); - if(value == "") - { - nullColumn = true; //날짜가 없다면 패스 - break; - } - } - } - else - { - var dateStrin = sheet.readStr(r, c); - - var strVallue = sheet.readStr(r, c); - if (strVallue=="" && c == MinCol) - { - //첫줄 첫행이 빈값이면 처리하지 않는다. - nullColumn = true; - break; - } - if (cols[c-1] != "") - dr[cols[c-1]] = strVallue; - } - } - if (nullColumn) continue; //줄처리를 못한 경우 넘어감 - if (dr != null) - { - dtExcel.Rows.Add(dr); - } - } - dtExcel.AcceptChanges(); - } - catch(Exception ex) - { - FCOMMON.Util.MsgE("불러오는 중 오류 발생\n" + ex.Message); - } - // - book = null; - - this.bs.DataSource = dtExcel; - this.dataGridView1.DataSource = dtExcel; - this.bn.BindingSource = this.bs; - - if(this.bs.Count < 1) - { - FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다."); - } - } - - - private void button3_Click(object sender, EventArgs e) - { - if(dtExcel == null || dtExcel.Rows.Count < 1) - { - FCOMMON.Util.MsgE("등록 가능한 자료가 없습니다."); - return; - } - - System.Text.StringBuilder sb = new StringBuilder(); - sb.AppendLine("다음 자료를 추가하시겠습니까?"); - sb.AppendLine(); - sb.AppendLine("'저장 완료' 메세지가 나올때 까지 기다려 주세요."); - sb.AppendLine(); - sb.AppendLine("실행 하려면 '예' 를 누르세요"); - var dlg = FCOMMON.Util.MsgQ(sb.ToString()); - if (dlg != System.Windows.Forms.DialogResult.Yes) return; - - dt.Clear(); - dt.AcceptChanges(); - - this.progressBar1.Value = 0; - this.progressBar1.Maximum = dtExcel.Rows.Count; - - //12,13 - foreach (DataRow dr in dtExcel.Rows) - { - this.progressBar1.Value += 1; - - //데이터추가 - var newdr = dt.NewRow(); - if (dr[8] == DBNull.Value) continue; //nullerror - - newdr["level"] = 1; - newdr["status"] = "완료";// dr[0].ToString(); - newdr["part"] = dr[1].ToString(); - newdr["process"] = dr[2].ToString(); - newdr["reqstaff"] = dr[9].ToString(); - newdr["usermanager"] = dr[36].ToString(); //"정봉석";// dr[4].ToString(); - newdr["usermain"] = dr[36].ToString(); //"";// dr[5].ToString(); - newdr["usersub"] = "";// dr[6].ToString(); - newdr["memo"] = "";// dr[7].ToString(); //CR / Order / PO No. - newdr["asset"] = "";// dr[8].ToString(); - newdr["name"] = dr[7].ToString(); - - if (newdr["name"].ToString() == "") continue; //이름없는것은 처리 안함 - - newdr["remark_req"] = "";// dr[10].ToString(); - newdr["remark_ans"] = "";// dr[11].ToString(); - //12=request date - newdr["sdate"] = "2018-12-31";// dr[13].ToString(); - newdr["ddate"] = "2018-12-31";//dr[14].ToString(); - newdr["edate"] = "2018-12-31";//dr[15].ToString(); - - //float value_progress = 0; - //if (Single.TryParse(dr[12-1].ToString(), out value_progress)) - // newdr["progress"] = value_progress; - - - string 대수 =dr[35].ToString().Replace("대","").Replace("수",""); - if (대수 == "") 대수 = "0"; - - newdr["cnt"] = int.Parse(대수); - - string sCostO = dr[11].ToString(); - string sCostN = dr[13].ToString(); - if (sCostO == "") sCostO = "0"; - if (sCostN == "") sCostN = "0"; - - float value_costo = 0; - float value_costn = 0; - if(float.TryParse(sCostO,out value_costo)) - newdr["costo"] = value_costo; - if(float.TryParse(sCostO,out value_costn)) - newdr["costn"] = value_costn; - - newdr["import"] = true; - newdr["wuid"] = "JBS";// FCOMMON.info.Login.no; - newdr["wdate"] = DateTime.Now; - - dt.Rows.Add(newdr); - } - - var taE = new dsPRJTableAdapters.ProjectsTableAdapter(); - if (checkBox1.Checked) taE.DeleteImport(FCOMMON.info.Login.gcode); - taE.Update((dsPRJ.ProjectsDataTable)dt); - - dt.AcceptChanges(); - FCOMMON.Util.MsgI("Save OK"); - } - - private void panel1_Paint(object sender, PaintEventArgs e) - { - - } - - private void button2_Click(object sender, EventArgs e) - { - - - } - } -} +using FCOMMON; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FPJ0000 +{ + public partial class ImportC : fBase + { + DataTable dt = new dsPRJ.ProjectsDataTable(); + DataTable dtExcel = new DataTable(); + public ImportC() + { + InitializeComponent(); + this.FormClosed += __Closed; + } + + private void __Load(object sender, EventArgs e) + { + EnsureVisibleAndUsableSize(); + } + + void __Closed(object sender, FormClosedEventArgs e) + { + + } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + OpenFileDialog od = new OpenFileDialog(); + od.Filter = "excel|*.xlsx|all files|*.*"; + od.InitialDirectory = FCOMMON.Util.CurrentPath + "model"; + od.FilterIndex = 1; + od.RestoreDirectory = true; + if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + textBox1.Text = od.FileName; + } + + private void button1_Click(object sender, EventArgs e) + { + int ColumnNameNo = (int)numericUpDown2.Value; + if(textBox1.Text == "") + { + FCOMMON.Util.MsgE("파일을 선택하세요"); + textBox1.Focus(); + return; + } + if(!System.IO.File.Exists(textBox1.Text)) + { + FCOMMON.Util.MsgE("입력하신 파일이 존재하지 않습니다."); + textBox1.Focus(); + textBox1.SelectAll(); + return; + } + + dtExcel.Columns.Clear(); + dtExcel.Rows.Clear(); + dtExcel.AcceptChanges(); + + libxl.Book book;// = new libxl.BinBook(); + book = new libxl.XmlBook(); + book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); + try + { + book.load(textBox1.Text); + }catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + return; + } + + var sheet = book.getSheet((int)nudSheet.Value-1); + var MaxRow = sheet.lastRow(); + var MinRow = sheet.firstRow(); + + MaxRow = (int)Math.Min(MaxRow, nudE.Value-1); + MinRow = (int)Math.Max(MinRow, nudS.Value-1); + if(MinRow <= (ColumnNameNo-1)) + { + FCOMMON.Util.MsgI("시작줄을 제목줄 보다 커야 합니다. 자동으로 +1 증가합니다."); + MinRow = ColumnNameNo ; + } + + + var MaxCol = sheet.lastCol(); + var MinCol = sheet.firstCol(); + + MaxCol = (int)Math.Min(MaxCol, nudCE.Value - 1); + MinCol = (int)Math.Max(MinCol, nudCS.Value - 1); + + //제목줄을 처리한다. 181029 + List cols = new List(); + + for (int c = MinCol; c <= MaxCol; c++) + { + var strVallue = sheet.readStr(ColumnNameNo-1, c); + if (strVallue == "" ) + { + if (c == MinCol) + { + //첫줄 첫행이 빈값이면 처리하지 않는다. + FCOMMON.Util.MsgE("열 제목에 빈값이 있어 처리되지 못합니다."); + return; + } + else + { + //빈값이 나왓으므로 열 최대값을 변경해준다. + if(c < MaxCol) + { + FCOMMON.Util.MsgI("빈값으로 인해 최대 열 번호를 " + c.ToString() + "로 변경합니다"); + MaxCol = c; + break; + } + } + } + if(cols.IndexOf(strVallue) >= 0) + { + FCOMMON.Util.MsgE("동일 컬럼이 발견 됨 진행 불가 : " + strVallue); + return; + } + else + { + cols.Add(strVallue); + } + + this.dtExcel.Columns.Add(strVallue); + } + + + try{ + for (int r = MinRow; r <= MaxRow; r++) + { + DataRow dr = dtExcel.NewRow(); + + Boolean nullColumn = false; + for (int c = MinCol; c <= Math.Min(cols.Count,MaxCol); c++) + { + if (sheet.isDate(r, c)) + { + var datevalue = sheet.readNum(r, c); + int y, m, d; + y = m = d = 0; + book.dateUnpack(datevalue, ref y, ref m, ref d); + if (y >= 2000) + dr[cols[c]] = string.Format("{0:0000}-{1:00}-{2:00}", y, m, d); + else + dr[cols[c]] = string.Empty; + + //일자가 만약 넘어서면 패스한다. + if(cols[c]=="일자" ) + { + string value = dr[cols[c]].ToString(); + if(value == "") + { + nullColumn = true; //날짜가 없다면 패스 + break; + } + } + } + else + { + var dateStrin = sheet.readStr(r, c); + + var strVallue = sheet.readStr(r, c); + if (strVallue=="" && c == MinCol) + { + //첫줄 첫행이 빈값이면 처리하지 않는다. + nullColumn = true; + break; + } + if (cols[c-1] != "") + dr[cols[c-1]] = strVallue; + } + } + if (nullColumn) continue; //줄처리를 못한 경우 넘어감 + if (dr != null) + { + dtExcel.Rows.Add(dr); + } + } + dtExcel.AcceptChanges(); + } + catch(Exception ex) + { + FCOMMON.Util.MsgE("불러오는 중 오류 발생\n" + ex.Message); + } + // + book = null; + + this.bs.DataSource = dtExcel; + this.dataGridView1.DataSource = dtExcel; + this.bn.BindingSource = this.bs; + + if(this.bs.Count < 1) + { + FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다."); + } + } + + + private void button3_Click(object sender, EventArgs e) + { + if(dtExcel == null || dtExcel.Rows.Count < 1) + { + FCOMMON.Util.MsgE("등록 가능한 자료가 없습니다."); + return; + } + + System.Text.StringBuilder sb = new StringBuilder(); + sb.AppendLine("다음 자료를 추가하시겠습니까?"); + sb.AppendLine(); + sb.AppendLine("'저장 완료' 메세지가 나올때 까지 기다려 주세요."); + sb.AppendLine(); + sb.AppendLine("실행 하려면 '예' 를 누르세요"); + var dlg = FCOMMON.Util.MsgQ(sb.ToString()); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + + dt.Clear(); + dt.AcceptChanges(); + + this.progressBar1.Value = 0; + this.progressBar1.Maximum = dtExcel.Rows.Count; + + //12,13 + foreach (DataRow dr in dtExcel.Rows) + { + this.progressBar1.Value += 1; + + //데이터추가 + var newdr = dt.NewRow(); + if (dr[8] == DBNull.Value) continue; //nullerror + + newdr["level"] = 1; + newdr["status"] = "완료";// dr[0].ToString(); + newdr["part"] = dr[1].ToString(); + newdr["process"] = dr[2].ToString(); + newdr["reqstaff"] = dr[9].ToString(); + newdr["usermanager"] = dr[36].ToString(); //"정봉석";// dr[4].ToString(); + newdr["usermain"] = dr[36].ToString(); //"";// dr[5].ToString(); + newdr["usersub"] = "";// dr[6].ToString(); + newdr["memo"] = "";// dr[7].ToString(); //CR / Order / PO No. + newdr["asset"] = "";// dr[8].ToString(); + newdr["name"] = dr[7].ToString(); + + if (newdr["name"].ToString() == "") continue; //이름없는것은 처리 안함 + + newdr["remark_req"] = "";// dr[10].ToString(); + newdr["remark_ans"] = "";// dr[11].ToString(); + //12=request date + newdr["sdate"] = "2018-12-31";// dr[13].ToString(); + newdr["ddate"] = "2018-12-31";//dr[14].ToString(); + newdr["edate"] = "2018-12-31";//dr[15].ToString(); + + //float value_progress = 0; + //if (Single.TryParse(dr[12-1].ToString(), out value_progress)) + // newdr["progress"] = value_progress; + + + string 대수 =dr[35].ToString().Replace("대","").Replace("수",""); + if (대수 == "") 대수 = "0"; + + newdr["cnt"] = int.Parse(대수); + + string sCostO = dr[11].ToString(); + string sCostN = dr[13].ToString(); + if (sCostO == "") sCostO = "0"; + if (sCostN == "") sCostN = "0"; + + float value_costo = 0; + float value_costn = 0; + if(float.TryParse(sCostO,out value_costo)) + newdr["costo"] = value_costo; + if(float.TryParse(sCostO,out value_costn)) + newdr["costn"] = value_costn; + + newdr["import"] = true; + newdr["wuid"] = "JBS";// FCOMMON.info.Login.no; + newdr["wdate"] = DateTime.Now; + + dt.Rows.Add(newdr); + } + + var taE = new dsPRJTableAdapters.ProjectsTableAdapter(); + if (checkBox1.Checked) taE.DeleteImport(FCOMMON.info.Login.gcode); + taE.Update((dsPRJ.ProjectsDataTable)dt); + + dt.AcceptChanges(); + FCOMMON.Util.MsgI("Save OK"); + } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + + } + + private void button2_Click(object sender, EventArgs e) + { + + + } + } +} diff --git a/SubProject/FPJ0000/JobReport_/K5Dailyform.cs b/SubProject/FPJ0000/JobReport_/K5Dailyform.cs index 979344e..f565088 100644 --- a/SubProject/FPJ0000/JobReport_/K5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/K5Dailyform.cs @@ -1,4 +1,5 @@ using FarPoint.Win; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class K5Dailyform : Form + public partial class K5Dailyform : fBase { Boolean binit = false; public K5Dailyform() @@ -23,6 +24,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs index d7b203c..74d8447 100644 --- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs +++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs @@ -1,4 +1,5 @@ using FarPoint.Win; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fJobChartMenu : Form + public partial class fJobChartMenu : fBase { Boolean binit = false; @@ -28,6 +29,7 @@ namespace FPJ0000.JobReport_ } private void fJobChartMenu_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 7921b8b..03d3fa4 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -90,6 +90,7 @@ namespace FPJ0000 } private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01"); var sdate = DateTime.Parse(dtSD.Text); this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReportAI.cs b/SubProject/FPJ0000/JobReport_/fJobReportAI.cs index 0884b6f..20c2426 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReportAI.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReportAI.cs @@ -30,7 +30,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //공정목록 var taProc = new dsReportTableAdapters.ProcessListTableAdapter(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReportImport.cs b/SubProject/FPJ0000/JobReport_/fJobReportImport.cs index 0376d07..062dfb6 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReportImport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReportImport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fJobReportImport : Form + public partial class fJobReportImport : fBase { DataTable dt = new dsPRJ.JobReportDataTable(); DataTable dtExcel = new DataTable(); @@ -21,8 +22,7 @@ namespace FPJ0000.JobReport_ private void __Load(object sender, EventArgs e) { - //this.sd.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01"); - //this.ed.Value = DateTime.Now; + EnsureVisibleAndUsableSize(); //담당자목록 diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 4a40860..574456f 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fJobReport_Add : Form + public partial class fJobReport_Add : fBase { dsPRJ.JobReportRow dr; Boolean copyMOde = false; @@ -73,6 +74,7 @@ namespace FPJ0000.JobReport_ } private void fJobReport_Add_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //사용자목록 this.bs.DataSource = dr; this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm.ss"; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs b/SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs index 4220e8e..8cfd768 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fJobReport_AddAI : Form + public partial class fJobReport_AddAI : fBase { dsPRJ.EETGW_JobReport_AutoInputRow dr; Boolean copyMOde = false; @@ -61,6 +62,7 @@ namespace FPJ0000.JobReport_ private void fJobReport_Add_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //사용자목록 this.bs.DataSource = dr; diff --git a/SubProject/FPJ0000/JobReport_/fLovProject.cs b/SubProject/FPJ0000/JobReport_/fLovProject.cs index f2e278e..a8025a7 100644 --- a/SubProject/FPJ0000/JobReport_/fLovProject.cs +++ b/SubProject/FPJ0000/JobReport_/fLovProject.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fLovProject : Form + public partial class fLovProject : fBase { public string Title { get; set; } public int Index { get; set; } @@ -31,8 +32,8 @@ namespace FPJ0000.JobReport_ private void fLovItem_Load(object sender, EventArgs e) { - //search data - // var dt = this.ta.GetSearch(this.keyword); + EnsureVisibleAndUsableSize(); + // var dt = this.ta.GetSearch(this.keyword); this.taPrj.FillSearch(this.dsMSSQL.Projects,this.keyword,FCOMMON.info.Login.gcode); this.taJob.FillSearch(this.dsQuery.JobReportItemList, this.keyword, FCOMMON.info.Login.gcode); diff --git a/SubProject/FPJ0000/JobReport_/fProjectConnect.cs b/SubProject/FPJ0000/JobReport_/fProjectConnect.cs index 2ed50ea..3b75b91 100644 --- a/SubProject/FPJ0000/JobReport_/fProjectConnect.cs +++ b/SubProject/FPJ0000/JobReport_/fProjectConnect.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fProjectConnect : Form + public partial class fProjectConnect : fBase { public fProjectConnect(string sd, string ed) { @@ -20,8 +21,9 @@ namespace FPJ0000.JobReport_ } private void fProjectConnect_Load(object sender, EventArgs e) - { - RefreshList(); + { + EnsureVisibleAndUsableSize(); + RefreshList(); } void RefreshList() diff --git a/SubProject/FPJ0000/JobReport_/fSelectProcess.cs b/SubProject/FPJ0000/JobReport_/fSelectProcess.cs index a6c71e3..3c5e997 100644 --- a/SubProject/FPJ0000/JobReport_/fSelectProcess.cs +++ b/SubProject/FPJ0000/JobReport_/fSelectProcess.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fSelectProcess : Form + public partial class fSelectProcess : fBase { public List values = new List(); public fSelectProcess(string[] list) @@ -21,7 +22,7 @@ namespace FPJ0000.JobReport_ private void fSelectProcess_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //공정목록 var taProc = new dsReportTableAdapters.ProcessListTableAdapter(); var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode); diff --git a/SubProject/FPJ0000/JobReport_/rJobChart.cs b/SubProject/FPJ0000/JobReport_/rJobChart.cs index e3c4d29..95369bc 100644 --- a/SubProject/FPJ0000/JobReport_/rJobChart.cs +++ b/SubProject/FPJ0000/JobReport_/rJobChart.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobChart : Form + public partial class rJobChart : fBase { public rJobChart(string uid,string sdate, string edate) { @@ -22,6 +23,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.cs b/SubProject/FPJ0000/JobReport_/rJobReport.cs index 08c4e0f..954e63f 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReport : Form + public partial class rJobReport : fBase { public rJobReport() { @@ -19,6 +20,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("전체"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs index ee9d282..89c7d5f 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportDay : Form + public partial class rJobReportDay : fBase { // Boolean binit = false; public rJobReportDay(string baseday ) @@ -23,6 +24,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("전체"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs index dfb63b5..5391d69 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportOT : Form + public partial class rJobReportOT : fBase { public rJobReportOT() { @@ -18,8 +19,9 @@ namespace FPJ0000.JobReport_ } private void rJobReport_Load(object sender, EventArgs e) - { - this.tbProcess.Items.Clear(); + { + EnsureVisibleAndUsableSize(); + this.tbProcess.Items.Clear(); tbProcess.Items.Add("전체"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs index 5ee46a5..3895d7e 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportPrj : Form + public partial class rJobReportPrj : fBase { Boolean binit = false; public rJobReportPrj(string baseday) @@ -23,6 +24,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs index 682e40d..4dc8ac4 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportPrjSche : Form + public partial class rJobReportPrjSche : fBase { Boolean binit = false; public rJobReportPrjSche() @@ -20,6 +21,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); var myCI = new System.Globalization.CultureInfo("ko-KR"); var myCal = myCI.Calendar; diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.cs b/SubProject/FPJ0000/JobReport_/rJobReportType.cs index b7f3d25..b795292 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportType.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportType.cs @@ -1,4 +1,5 @@ -using NetOffice.OutlookApi; +using FCOMMON; +using NetOffice.OutlookApi; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportType : Form + public partial class rJobReportType : fBase { Boolean binit = false; public rJobReportType() @@ -24,6 +25,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); tbProcess.Items.Add("--전체--"); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs index 800602f..ac85285 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs @@ -1,4 +1,5 @@ using FarPoint.Win; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportUser : Form + public partial class rJobReportUser : fBase { Boolean binit = false; public rJobReportUser() @@ -23,7 +24,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); this.fpSpread1_Sheet2.AddSelection(2, 3, 4, 3); // fpSpread1_Sheet2.Columns[1, 0].AllowAutoSort = true; //this.fpSpread1_Sheet2.ColumnHeader.AutoTextIndex = 1; diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs index de47063..58f7a66 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs @@ -1,4 +1,5 @@ -using Microsoft.Reporting.WinForms; +using FCOMMON; +using Microsoft.Reporting.WinForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rK5Dailyform : Form + public partial class rK5Dailyform : fBase { public rK5Dailyform() { @@ -20,6 +21,7 @@ namespace FPJ0000.JobReport_ private void rJobReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-01"); this.dtED.Text = DateTime.Parse(dtSD.Text).AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd"); this.Show(); diff --git a/SubProject/FPJ0000/Note/fNote.cs b/SubProject/FPJ0000/Note/fNote.cs index 45c85ef..976b88f 100644 --- a/SubProject/FPJ0000/Note/fNote.cs +++ b/SubProject/FPJ0000/Note/fNote.cs @@ -35,7 +35,7 @@ namespace FPJ0000.Note private void __Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); this.dtSD.Text = DateTime.Now.AddYears(-10).ToString("yyyy-MM-01"); this.dtED.Text = DateTime.Now.ToShortDateString(); diff --git a/SubProject/FPJ0000/Note/fNote_Add.cs b/SubProject/FPJ0000/Note/fNote_Add.cs index 8a5d6ae..5173aca 100644 --- a/SubProject/FPJ0000/Note/fNote_Add.cs +++ b/SubProject/FPJ0000/Note/fNote_Add.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.Note { - public partial class fNote_Add : Form + public partial class fNote_Add : fBase { int idx = -1; Boolean copyMOde = false; @@ -39,6 +40,7 @@ namespace FPJ0000.Note private void fJobReport_Add_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //담당자목록 var dt_users = FCOMMON.DBM.getActiveUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); this.cmbUser.DisplayMember = "dispName"; diff --git a/SubProject/FPJ0000/Note/fTextEditor.cs b/SubProject/FPJ0000/Note/fTextEditor.cs index 7732e2d..a14e2de 100644 --- a/SubProject/FPJ0000/Note/fTextEditor.cs +++ b/SubProject/FPJ0000/Note/fTextEditor.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000.Note { - public partial class fTextEditor : Form + public partial class fTextEditor : fBase { // Boolean bInit = false; @@ -31,8 +32,8 @@ namespace FPJ0000.Note private void fJobReport_Add_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 8ec1d60..4a63741 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -46,6 +46,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString(); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 2df0b60..33304ed 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.OtConfirm { - public partial class fHolyRequestAdd : Form + public partial class fHolyRequestAdd : fBase { DSKuntae.EETGW_HolydayRequestRow dr; Boolean binit = false; @@ -111,6 +112,7 @@ namespace FPJ0000.OtConfirm public bool IsAdmin { get { return curLevel >= 5; } } private void fHolyRequestAdd_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); @@ -421,6 +423,18 @@ namespace FPJ0000.OtConfirm else if (rad1.Checked) dr.conf = 1; else if (rad2.Checked) dr.conf = 2; else dr.conf = 0; + + if(rad1.Checked || rad2.Checked) + { + dr.conf_id = FCOMMON.info.Login.no; + dr.conf_time = DateTime.Now; + } + else + { + dr.Setconf_idNull(); + dr.Setconf_timeNull(); + } + dr.EndEdit(); DialogResult = DialogResult.OK; diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs index 59b03b3..0785a54 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs @@ -34,6 +34,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01"); //var sdate = DateTime.Parse(dtSD.Text); this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString(); diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs index 7dc0cc3..aa79c4d 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.OtConfirm { - public partial class fOTConfirmOK : Form + public partial class fOTConfirmOK : fBase { dsPRJ.JobReportRow[] dr; //Boolean binit = false; @@ -26,6 +27,7 @@ namespace FPJ0000.OtConfirm int curLevel = 0; private void fHolyRequestAdd_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); button1.Enabled = curLevel >= 5; //binit = true; diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs index 9f2bcbc..75bc53b 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.OtConfirm { - public partial class fOTConfirmValue : Form + public partial class fOTConfirmValue : fBase { public fOTConfirmValue() { @@ -19,7 +20,7 @@ namespace FPJ0000.OtConfirm private void fOTConfirmValue_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } private void btOK_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs index d182c6d..4b0f972 100644 --- a/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs +++ b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.OtConfirm { - public partial class fOutCoomplete : Form + public partial class fOutCoomplete : fBase { public fOutCoomplete(DSKuntae.EETGW_HolydayRequestRow dr) { @@ -23,7 +24,11 @@ namespace FPJ0000.OtConfirm else this.dtED.Value = DateTime.Parse(ed.ToShortDateString() + " " + dr.etime + ":00"); } - + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } private void button1_Click(object sender, EventArgs e) { if (FCOMMON.Util.MsgQ("완료 할까요? 관리자 완료 메일이 발송 됩니다") != DialogResult.Yes) return; diff --git a/SubProject/FPJ0000/Project/fLayoutEdit.cs b/SubProject/FPJ0000/Project/fLayoutEdit.cs index 76af3ea..d4ee38c 100644 --- a/SubProject/FPJ0000/Project/fLayoutEdit.cs +++ b/SubProject/FPJ0000/Project/fLayoutEdit.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.Project { - public partial class fLayoutEdit : Form + public partial class fLayoutEdit : fBase { public fLayoutEdit(int no) { @@ -35,7 +36,7 @@ namespace FPJ0000.Project private void fLayoutEdit_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); } private void button1_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index f777e54..8e79e8e 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -92,7 +92,7 @@ namespace FPJ0000 private void fPartList_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //정렬방식 저장값 불러오기 var SetFile = util.CurrentPath + "FormSetting.xml"; diff --git a/SubProject/FPJ0000/Project/fProejctHistory.cs b/SubProject/FPJ0000/Project/fProejctHistory.cs index 420c767..d9c51fb 100644 --- a/SubProject/FPJ0000/Project/fProejctHistory.cs +++ b/SubProject/FPJ0000/Project/fProejctHistory.cs @@ -19,6 +19,7 @@ namespace FPJ0000 } private void fProejctHistory_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); try { this.ta.Fill(this.dsPRJ.ProjectsHistory, this.pidx); diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 7e22838..e5d1dd0 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -37,7 +37,7 @@ namespace FPJ0000 } private void fProjectData_Load(object sender, EventArgs e) { - + EnsureVisibleAndUsableSize(); //사용자목록업데이트 UpdateUserList(); diff --git a/SubProject/FPJ0000/Project/fProjectIOMap.cs b/SubProject/FPJ0000/Project/fProjectIOMap.cs index a9e3263..2d86492 100644 --- a/SubProject/FPJ0000/Project/fProjectIOMap.cs +++ b/SubProject/FPJ0000/Project/fProjectIOMap.cs @@ -35,6 +35,7 @@ namespace FPJ0000 private void fProjectSchedule_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); RefreshData(); } diff --git a/SubProject/FPJ0000/Project/fProjectLayout.cs b/SubProject/FPJ0000/Project/fProjectLayout.cs index c5b6b6a..ba55496 100644 --- a/SubProject/FPJ0000/Project/fProjectLayout.cs +++ b/SubProject/FPJ0000/Project/fProjectLayout.cs @@ -43,6 +43,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.Show(); Application.DoEvents(); refreshData(); diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 966d1a0..1635312 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -37,7 +37,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //프로젝트 목록을 처리함 + EnsureVisibleAndUsableSize(); this.tbRequest.Text = FCOMMON.info.Login.nameK; cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 diff --git a/SubProject/FPJ0000/Project/fProjectListU.cs b/SubProject/FPJ0000/Project/fProjectListU.cs index 24b61a2..e73b3b2 100644 --- a/SubProject/FPJ0000/Project/fProjectListU.cs +++ b/SubProject/FPJ0000/Project/fProjectListU.cs @@ -28,6 +28,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //프로젝트 목록을 처리함 //this.tbRequest.Text = FCOMMON.info.Login.nameK; //cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 diff --git a/SubProject/FPJ0000/Project/fProjectListUser.cs b/SubProject/FPJ0000/Project/fProjectListUser.cs index dde2787..4b76750 100644 --- a/SubProject/FPJ0000/Project/fProjectListUser.cs +++ b/SubProject/FPJ0000/Project/fProjectListUser.cs @@ -34,7 +34,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //프로젝트 목록을 처리함 + EnsureVisibleAndUsableSize(); //this.tbRequest.Text = FCOMMON.info.Login.nameK; cmbDateType.SelectedIndex = 1; //기본시작일 기준으로 한다 diff --git a/SubProject/FPJ0000/Project/fProjectListUserDetail.cs b/SubProject/FPJ0000/Project/fProjectListUserDetail.cs index 7cfd277..aa796aa 100644 --- a/SubProject/FPJ0000/Project/fProjectListUserDetail.cs +++ b/SubProject/FPJ0000/Project/fProjectListUserDetail.cs @@ -40,8 +40,8 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //프로젝트 목록을 처리함 - + EnsureVisibleAndUsableSize(); + refreshData(); //일반사용자의경우에는 상태를 변경하지 못한다. diff --git a/SubProject/FPJ0000/Project/fProjectPartImport.cs b/SubProject/FPJ0000/Project/fProjectPartImport.cs index 2e215ad..7325d3d 100644 --- a/SubProject/FPJ0000/Project/fProjectPartImport.cs +++ b/SubProject/FPJ0000/Project/fProjectPartImport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fProjectPartImport : Form + public partial class fProjectPartImport : fBase { int ProjectIndex = -1; public fProjectPartImport(int pidx_) @@ -34,8 +35,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //this.sd.Value = DateTime.Now.AddMonths(-1); - //this.dtPdate.Value = DateTime.Now; + EnsureVisibleAndUsableSize(); } void __Closed(object sender, FormClosedEventArgs e) diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.cs b/SubProject/FPJ0000/Project/fProjectPartListEdit.cs index 97fc9ef..b444a4f 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.cs +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.cs @@ -22,7 +22,7 @@ namespace FPJ0000 private void fProjectData_Load(object sender, EventArgs e) { - //자료를 불러온다 + EnsureVisibleAndUsableSize(); //ta.FillByIdx(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode, this.dr); memoTextBox.Text = memoTextBox.Text.Trim(); itemSupplyTextBox.Text = itemSupplyTextBox.Text.Trim(); diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs index e83f3d2..7bf71b4 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs @@ -1,4 +1,5 @@ -using NetOffice.OutlookApi; +using FCOMMON; +using NetOffice.OutlookApi; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fProjectPartToPurchaseCR : Form + public partial class fProjectPartToPurchaseCR : fBase { int ProjectIndex = -1; List IDXList; @@ -128,7 +129,7 @@ namespace FPJ0000 } private void __Load(object sender, EventArgs e) { - //프로젝트정보를 찾는다. + EnsureVisibleAndUsableSize(); toolStripButton2.Text = "선택삭제(&D)"; var dtPrj = taProject.GetbyIDX(this.ProjectIndex); var drPrj = dtPrj.Rows[0] as dsPRJ.ProjectsRow; diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index ed3e638..acc628f 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -84,7 +84,7 @@ namespace FPJ0000 private void fProjectSchedule_Load(object sender, EventArgs e) { - //프로젝트 정보 채우기 + EnsureVisibleAndUsableSize(); //var da2 = new System.Data.SqlClient.SqlDataAdapter(); //da2.SelectCommand = new System.Data.SqlClient.SqlCommand("", ta.Connection); diff --git a/SubProject/FPJ0000/Project/fProjectSummary.cs b/SubProject/FPJ0000/Project/fProjectSummary.cs index 39a0878..f386346 100644 --- a/SubProject/FPJ0000/Project/fProjectSummary.cs +++ b/SubProject/FPJ0000/Project/fProjectSummary.cs @@ -29,6 +29,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //프로젝트 목록을 처리함 this.tbRequest.Text = FCOMMON.info.Login.nameK; cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 diff --git a/SubProject/FPJ0000/Project/fSCCheck.cs b/SubProject/FPJ0000/Project/fSCCheck.cs index 89f7078..ce2ecb7 100644 --- a/SubProject/FPJ0000/Project/fSCCheck.cs +++ b/SubProject/FPJ0000/Project/fSCCheck.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fSCCheck : Form + public partial class fSCCheck : fBase { dsPRJ.ProjectsPartDataTable dt; public fSCCheck(dsPRJ.ProjectsPartDataTable dt_) @@ -22,7 +23,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { - //this.sd.Value = DateTime.Now.AddMonths(-1); + EnsureVisibleAndUsableSize(); //this.dtPdate.Value = DateTime.Now; textBox1.AllowDrop = true; this.textBox1.DragDrop += TextBox1_DragDrop; diff --git a/SubProject/FPJ0000/Project/fSPMaster.Designer.cs b/SubProject/FPJ0000/Project/fSPMaster.Designer.cs deleted file mode 100644 index 896a5fd..0000000 --- a/SubProject/FPJ0000/Project/fSPMaster.Designer.cs +++ /dev/null @@ -1,515 +0,0 @@ -namespace FPJ0000 -{ - partial class fSPMaster - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSPMaster)); - FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FPJ0000.dsPRJ(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ta = new FPJ0000.dsPRJTableAdapters.SPMasterTableAdapter(); - this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.panel2 = new System.Windows.Forms.Panel(); - this.tbFind = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.chkZeroCount = new System.Windows.Forms.ToolStripButton(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - this.cm1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - this.panel2.SuspendLayout(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.toolStripSeparator1, - this.chkZeroCount}); - this.bn.Location = new System.Drawing.Point(0, 514); - this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bn.Name = "bn"; - this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(924, 25); - this.bn.TabIndex = 2; - this.bn.Text = "bindingNavigator1"; - // - // bs - // - this.bs.DataMember = "SPMaster"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Filter = "CurrentQty > 0"; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "DSMssql"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.EETGW_NoteTableAdapter = null; - this.tam.JobReportTableAdapter = null; - this.tam.ProjectsHistoryTableAdapter = null; - this.tam.ProjectsIOMapTableAdapter = null; - this.tam.ProjectsMailListTableAdapter = null; - this.tam.ProjectsPartTableAdapter = null; - this.tam.ProjectsTableAdapter = null; - this.tam.SPMasterTableAdapter = this.ta; - this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.fpSpread1.ContextMenuStrip = this.cm1; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer1; - this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); - this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer1; - this.fpSpread1.Location = new System.Drawing.Point(0, 52); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(924, 462); - this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; - this.fpSpread1.TabIndex = 1; - this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); - this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; - this.fpSpread1.SetViewportLeftColumn(0, 0, 2); - // - // cm1 - // - this.cm1.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.columnSizeToolStripMenuItem, - this.exportListToolStripMenuItem}); - this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(243, 76); - // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.autoToolStripMenuItem, - this.resetToolStripMenuItem, - this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(242, 36); - this.columnSizeToolStripMenuItem.Text = "열 너비 조정"; - // - // autoToolStripMenuItem - // - this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); - this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(194, 36); - this.autoToolStripMenuItem.Text = "자동 조정"; - this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); - // - // resetToolStripMenuItem - // - this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); - this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(194, 36); - this.resetToolStripMenuItem.Text = "초기화"; - this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(194, 36); - this.saveToolStripMenuItem.Text = "저장"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(194, 36); - this.loadToolStripMenuItem.Text = "불러오기"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // - // exportListToolStripMenuItem - // - this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(242, 36); - this.exportListToolStripMenuItem.Text = "목록 내보내기"; - this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 15; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.Parent = "ColumnFooterFlat"; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "CornerFooterFlat"; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ID"; - this.fpSpread1_Sheet1.Columns.Get(0).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType27; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "CtrlNo"; - this.fpSpread1_Sheet1.Columns.Get(1).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType28; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "SIDNo"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 98F; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "CurrentQty"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 97F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType29; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "PartName"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 91F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType30; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "PartNo"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType31; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "Storage"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 91F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType32; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Location"; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 97F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType33; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "UseEqmt"; - this.fpSpread1_Sheet1.Columns.Get(8).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType34; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "SupplierNo"; - this.fpSpread1_Sheet1.Columns.Get(9).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType35; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Division"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 126F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType36; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "PriceUnit"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 72F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType37; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType38; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "EnrDate"; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 96F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType39; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "Enrollee"; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 94F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.Parent = "FilterBarFlat"; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.Parent = "RowHeaderFlat"; - this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "CornerHeaderFlat"; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // panel2 - // - this.panel2.Controls.Add(this.tbFind); - this.panel2.Controls.Add(this.button1); - this.panel2.Controls.Add(this.label3); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(924, 52); - this.panel2.TabIndex = 0; - // - // tbFind - // - this.tbFind.Dock = System.Windows.Forms.DockStyle.Fill; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbFind.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbFind.Location = new System.Drawing.Point(118, 0); - this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(693, 52); - this.tbFind.TabIndex = 1; - this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); - // - // button1 - // - this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(811, 0); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(113, 52); - this.button1.TabIndex = 2; - this.button1.Text = "검색(&F)"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // label3 - // - this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label3.Dock = System.Windows.Forms.DockStyle.Left; - this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(118, 52); - this.label3.TabIndex = 0; - this.label3.Text = "검색"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // chkZeroCount - // - this.chkZeroCount.CheckOnClick = true; - this.chkZeroCount.Image = global::FPJ0000.Properties.Resources.accept; - this.chkZeroCount.ImageTransparentColor = System.Drawing.Color.Magenta; - this.chkZeroCount.Name = "chkZeroCount"; - this.chkZeroCount.Size = new System.Drawing.Size(96, 22); - this.chkZeroCount.Text = "수량 \'0\' 포함"; - this.chkZeroCount.Click += new System.EventHandler(this.chkZeroCount_Click); - // - // fSPMaster - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(924, 539); - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.panel2); - this.Controls.Add(this.bn); - this.Name = "fSPMaster"; - this.Text = "PMP DataBase Search"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - this.cm1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private dsPRJ dsMSSQL; - private System.Windows.Forms.BindingSource bs; - private dsPRJTableAdapters.SPMasterTableAdapter ta; - private dsPRJTableAdapters.TableAdapterManager tam; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private FarPoint.Win.Spread.FpSpread fpSpread1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox tbFind; - private System.Windows.Forms.ContextMenuStrip cm1; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.ToolStripButton chkZeroCount; - } -} \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fSPMaster.cs b/SubProject/FPJ0000/Project/fSPMaster.cs deleted file mode 100644 index 69880f2..0000000 --- a/SubProject/FPJ0000/Project/fSPMaster.cs +++ /dev/null @@ -1,178 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FPJ0000 -{ - public partial class fSPMaster :FCOMMON.fBase - { - string fn_fpcolsize = ""; - public int qty = 0; - - string search = string.Empty; - int idx = -1; - public fSPMaster(string search_) - { - InitializeComponent(); - - fn_fpcolsize = System.IO.Path.Combine( - AppDomain.CurrentDomain.BaseDirectory, - "formSetting", - "fp_" + this.Name + ".ini"); - - this.WindowState = FormWindowState.Normal; - this.StartPosition = FormStartPosition.CenterScreen; - this.search = search_; - this.tbFind.Text = search_; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - } - - private void __Load(object sender, EventArgs e) - { - this.Show(); - this.bs.Filter = "Storage <> 'B-CENTER'"; - Application.DoEvents(); - button1.PerformClick(); - - } - void refreshData(string div) - { - this.ta.Fill(this.dsMSSQL.SPMaster, "%" + div + "%"); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - tbFind.Focus(); - // tbFind.SelectAll(); - } - - - private void bs_CurrentChanged(object sender, EventArgs e) - { - idx = -1; - var drv = bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsPRJ.SPMasterRow;//.minutesRow; - idx = dr.ID; - } - - private void toolStripButton2_Click(object sender, EventArgs e) - { - try - { - var cnt = this.ta.Update(this.dsMSSQL.SPMaster); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - } - } - - private void 목록새로고침ToolStripMenuItem_Click(object sender, EventArgs e) - { - this.refreshData(this.search); - } - - //void Find() - //{ - // var txt = tbFind.Text.Trim(); - // if (txt == "") - // { - // if(bs.Filter != "") - // { - // bs.Filter = ""; - // tbFind.BackColor = Color.WhiteSmoke; - // } - // tbFind.Focus(); - // return; - // } - - // //검색어가 잇으므로 검색을 수행한다 - // var cols = new string[] { "SIDNo","Storage","Location", - // "PartName","PartNo","Memo","CostCenter","Enrollee"}; - // string filter = ""; - // foreach(var col in cols) - // { - // if (filter != "") filter += " or "; - // filter += col + " like '%"+ txt.Replace("'","''") +"%' "; - // } - // try - // { - // this.bs.Filter = filter; - // tbFind.BackColor = Color.Lime; - // tbFind.SelectAll(); - // }catch (Exception ex) - // { - // this.bs.Filter = ""; - // tbFind.BackColor = Color.Red; - // FCOMMON.Util.MsgE(ex.Message); - // } - //} - - private void button1_Click(object sender, EventArgs e) - { - refreshData(tbFind.Text.Trim()); - } - - private void tbFind_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - button1.PerformClick(); - } - - private void exportListToolStripMenuItem_Click(object sender, EventArgs e) - { - SaveFileDialog sd = new SaveFileDialog(); - sd.Filter = "excel|*.xls"; - var fn = "pmplist"; - sd.FileName = fn + ".xls"; - if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - } - } - - private void autoToolStripMenuItem_Click(object sender, EventArgs e) - { - this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; - - for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) - this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); - //dv1.AutoResizeColumns(); - } - - private void resetToolStripMenuItem_Click(object sender, EventArgs e) - { - foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) - { - col.Width = 100; - } - } - - private void saveToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); - } - - private void loadToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - - private void chkZeroCount_Click(object sender, EventArgs e) - { - if (chkZeroCount.Checked) - this.bs.Filter = "CurrentQty > 0 and Storage <> 'B-CENTER'"; - else - this.bs.Filter = "Storage <> 'B-CENTER'"; - } - } -} diff --git a/SubProject/FPJ0000/Project/fSPMaster.resx b/SubProject/FPJ0000/Project/fSPMaster.resx deleted file mode 100644 index 3f8a27b..0000000 --- a/SubProject/FPJ0000/Project/fSPMaster.resx +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 321, 17 - - - 122, 17 - - - 17, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - 17, 17 - - - 186, 17 - - - 248, 17 - - - 387, 17 - - - 462, 17 - - - - R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ - 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg - wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO - GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE - pRQTK6YYEAA7 - - - - - R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R - PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg - oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX - dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7 - - - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - - \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/rPartList.cs b/SubProject/FPJ0000/Project/rPartList.cs index 9624a54..601856d 100644 --- a/SubProject/FPJ0000/Project/rPartList.cs +++ b/SubProject/FPJ0000/Project/rPartList.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class rPartList : Form + public partial class rPartList : fBase { int ProjectIndex; public rPartList(int idx_) @@ -20,6 +21,7 @@ namespace FPJ0000 private void fRPartList_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); button1.PerformClick(); } diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs index 838cf7c..2520ce1 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs @@ -31,6 +31,7 @@ namespace FPJ0000 } private void fProjectData_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //상태 var dt_eetproc = FCOMMON.DBM.getCodeTable("10"); this.cmbProcess.DisplayMember = "Value"; diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs index 3e3b62f..28b8ab2 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs @@ -29,6 +29,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //프로젝트 목록을 처리함 //this.tbRequest.Text = FCOMMON.info.Login.nameK; cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs b/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs index b867fba..bcceb04 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace FPJ0000.SaveCost { - public partial class fSaveCostReport : Form + public partial class fSaveCostReport : fBase { public fSaveCostReport() { @@ -19,6 +20,7 @@ namespace FPJ0000.SaveCost private void fEBoardReport_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); //기본엑셀파일을 가져온다 this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/fHistAdd.cs b/SubProject/FPJ0000/fHistAdd.cs index 3ca0d0b..485b6b9 100644 --- a/SubProject/FPJ0000/fHistAdd.cs +++ b/SubProject/FPJ0000/fHistAdd.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fHistAdd : Form + public partial class fHistAdd : fBase { dsPRJ.ProjectsHistoryRow dr = null; public fHistAdd(dsPRJ.ProjectsHistoryRow dr_) @@ -26,6 +27,7 @@ namespace FPJ0000 private void fHistAdd_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); this.tbRemark.Text = this.dr.remark; this.mcDate.SetDate(DateTime.Parse( dr.pdate)); } diff --git a/SubProject/FPJ0000/fHistAddDay.cs b/SubProject/FPJ0000/fHistAddDay.cs index 988da82..3ea09ae 100644 --- a/SubProject/FPJ0000/fHistAddDay.cs +++ b/SubProject/FPJ0000/fHistAddDay.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -9,7 +10,7 @@ using System.Windows.Forms; namespace FPJ0000 { - public partial class fHistAddDay : Form + public partial class fHistAddDay : fBase { dsPRJ.EETGW_ProjecthistoryDRow dr = null; public fHistAddDay(dsPRJ.EETGW_ProjecthistoryDRow dr_) @@ -18,14 +19,9 @@ namespace FPJ0000 this.dr = dr_; this.KeyDown += fHistAdd_KeyDown; } - - void fHistAdd_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Escape) this.Close(); - } - - private void fHistAdd_Load(object sender, EventArgs e) + private void fHistAdd_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); if (this.dr.IsremarkNull() == false) this.tbRemark.Text = this.dr.remark; else @@ -34,6 +30,12 @@ namespace FPJ0000 this.mcDate.SetDate(DateTime.Parse(dr.pdate)); } + void fHistAdd_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Escape) this.Close(); + } + + private void btOK_Click(object sender, EventArgs e) { this.Validate(); diff --git a/SubProject/FPJ0000/fMailList.cs b/SubProject/FPJ0000/fMailList.cs index 4fe4814..68fb3fe 100644 --- a/SubProject/FPJ0000/fMailList.cs +++ b/SubProject/FPJ0000/fMailList.cs @@ -26,7 +26,25 @@ namespace FPJ0000 this.KeyDown += fPartList_KeyDown; this.dsPRJ.ProjectsMailList.TableNewRow += ProjectsPart_TableNewRow; } - + private void fPartList_Load(object sender, EventArgs e) + { + EnsureVisibleAndUsableSize(); + //열번호찾기 + //foreach(FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) + //{ + // string colname = col.DataField.ToLower(); + // if (colname == "itemmodel") colidx_model = col.Index; + // else if (colname == "itemname") colidx_itemname = col.Index; + // else if (colname == "item") colidx_item = col.Index; + // else if (colname == "qty") colidx_qty = col.Index; + // else if (colname == "price") colidx_price = col.Index; + // else if (colname == "amt") colidx_amt = col.Index; + // else if (colname == "supplyidx") colidx_supplyidx = col.Index; + // else if (col.Label.ToLower() == "supply") colidx_supply = col.Index; + //} + RefreshData(); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } void ProjectsPart_TableNewRow(object sender, DataTableNewRowEventArgs e) { e.Row["wuid"] = FCOMMON.info.Login.no; @@ -46,24 +64,7 @@ namespace FPJ0000 } - private void fPartList_Load(object sender, EventArgs e) - { - //열번호찾기 - //foreach(FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) - //{ - // string colname = col.DataField.ToLower(); - // if (colname == "itemmodel") colidx_model = col.Index; - // else if (colname == "itemname") colidx_itemname = col.Index; - // else if (colname == "item") colidx_item = col.Index; - // else if (colname == "qty") colidx_qty = col.Index; - // else if (colname == "price") colidx_price = col.Index; - // else if (colname == "amt") colidx_amt = col.Index; - // else if (colname == "supplyidx") colidx_supplyidx = col.Index; - // else if (col.Label.ToLower() == "supply") colidx_supply = col.Index; - //} - RefreshData(); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } + void RefreshData() { diff --git a/SubProject/FPJ0000/fMailSend.cs b/SubProject/FPJ0000/fMailSend.cs index 8386053..aad9fd7 100644 --- a/SubProject/FPJ0000/fMailSend.cs +++ b/SubProject/FPJ0000/fMailSend.cs @@ -167,6 +167,7 @@ namespace FPJ0000 private void fPartList_Load(object sender, EventArgs e) { + EnsureVisibleAndUsableSize(); fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.FormClosed += fPartList_FormClosed; this.KeyPreview = true; diff --git a/SubProject/FPM0000/FPM0000.csproj b/SubProject/FPM0000/FPM0000.csproj index 8dad31a..3310cd2 100644 --- a/SubProject/FPM0000/FPM0000.csproj +++ b/SubProject/FPM0000/FPM0000.csproj @@ -88,19 +88,10 @@ True DSMssql.xsd - - Form - - - fSPMaster.cs - - - fSPMaster.cs - ResXFileCodeGenerator diff --git a/SubProject/FPM0000/fSPMaster.Designer.cs b/SubProject/FPM0000/fSPMaster.Designer.cs deleted file mode 100644 index 17b20f3..0000000 --- a/SubProject/FPM0000/fSPMaster.Designer.cs +++ /dev/null @@ -1,569 +0,0 @@ -namespace FPM0000 -{ - partial class fSPMaster - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSPMaster)); - FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer2 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer3 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer4 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType26 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType27 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType28 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FPM0000.DSMssql(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ta = new FPM0000.DSMssqlTableAdapters.SPMasterTableAdapter(); - this.tam = new FPM0000.DSMssqlTableAdapters.TableAdapterManager(); - this.panel1 = new System.Windows.Forms.Panel(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.label2 = new System.Windows.Forms.Label(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.목록새로고침ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.panel2 = new System.Windows.Forms.Panel(); - this.tbFind = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.listView1 = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem, - this.toolStripButton1, - this.toolStripButton2, - this.toolStripSeparator1}); - this.bn.Location = new System.Drawing.Point(0, 514); - this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bn.Name = "bn"; - this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(924, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.Enabled = false; - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); - this.bindingNavigatorAddNewItem.Text = "Add(&A)"; - // - // bs - // - this.bs.DataMember = "SPMaster"; - this.bs.DataSource = this.dsMSSQL; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "DSMssql"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.Enabled = false; - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); - this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton1.Image = global::FPM0000.Properties.Resources.action_refresh; - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(66, 22); - this.toolStripButton1.Text = "Refresh"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // toolStripButton2 - // - this.toolStripButton2.Enabled = false; - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(67, 22); - this.toolStripButton2.Text = "Save(&S)"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.SPMasterTableAdapter = this.ta; - this.tam.UpdateOrder = FPM0000.DSMssqlTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // panel1 - // - this.panel1.Controls.Add(this.listView1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(192, 514); - this.panel1.TabIndex = 1; - // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer2; - this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); - this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer3; - this.fpSpread1.Location = new System.Drawing.Point(192, 23); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(732, 439); - this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; - this.fpSpread1.TabIndex = 2; - this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); - this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer4; - this.fpSpread1.SetViewportLeftColumn(0, 0, 9); - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 20; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.Parent = "ColumnFooterFlat"; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "CornerFooterFlat"; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - numberCellType26.DecimalPlaces = 0; - numberCellType26.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType26.MaximumValue = 2147483647D; - numberCellType26.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType26; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ID"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType76; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "CtrlNo"; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType77; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "SIDNo"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType78; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "Storage"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType79; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "Location"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType80; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "UseEqmt"; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType81; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "PartName"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType82; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "PartNo"; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType83; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Process"; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType84; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "SupplierNo"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 151F; - numberCellType27.MaximumValue = 999999999999999D; - numberCellType27.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType27; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "CurrentQty"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 75F; - numberCellType28.MaximumValue = 999999999999999D; - numberCellType28.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType28; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "MHA"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType85; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "Division"; - this.fpSpread1_Sheet1.Columns.Get(12).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 151F; - numberCellType29.MaximumValue = 999999999999999D; - numberCellType29.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType29; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "BadQty"; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 75F; - numberCellType30.MaximumValue = 999999999999999D; - numberCellType30.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType30; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "Price"; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType86; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "PriceUnit"; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType87; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "CostCenter"; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType88; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType89; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "EnrDate"; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType90; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "Enrollee"; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 151F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBar.DefaultStyle.Parent = "FilterBarFlat"; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.RowHeader.DefaultStyle.Parent = "RowHeaderFlat"; - this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; - this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "CornerHeaderFlat"; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Top; - this.label2.Location = new System.Drawing.Point(192, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(732, 23); - this.label2.TabIndex = 3; - this.label2.Text = "Division"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.목록새로고침ToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(155, 26); - // - // 목록새로고침ToolStripMenuItem - // - this.목록새로고침ToolStripMenuItem.Name = "목록새로고침ToolStripMenuItem"; - this.목록새로고침ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); - this.목록새로고침ToolStripMenuItem.Text = "목록 새로 고침"; - this.목록새로고침ToolStripMenuItem.Click += new System.EventHandler(this.목록새로고침ToolStripMenuItem_Click); - // - // panel2 - // - this.panel2.Controls.Add(this.tbFind); - this.panel2.Controls.Add(this.button1); - this.panel2.Controls.Add(this.label3); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Font = new System.Drawing.Font("맑은 고딕", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.panel2.Location = new System.Drawing.Point(192, 462); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(732, 52); - this.panel2.TabIndex = 5; - // - // tbFind - // - this.tbFind.Dock = System.Windows.Forms.DockStyle.Fill; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbFind.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbFind.Location = new System.Drawing.Point(118, 0); - this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(501, 52); - this.tbFind.TabIndex = 2; - this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); - // - // button1 - // - this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(619, 0); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(113, 52); - this.button1.TabIndex = 3; - this.button1.Text = "찾기(&F)"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // label3 - // - this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.label3.Dock = System.Windows.Forms.DockStyle.Left; - this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(118, 52); - this.label3.TabIndex = 1; - this.label3.Text = "검색"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // listView1 - // - this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1}); - this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.listView1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.listView1.FullRowSelect = true; - this.listView1.GridLines = true; - this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(0, 0); - this.listView1.MultiSelect = false; - this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(192, 514); - this.listView1.TabIndex = 1; - this.listView1.UseCompatibleStateImageBehavior = false; - this.listView1.View = System.Windows.Forms.View.Details; - this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); - // - // columnHeader1 - // - this.columnHeader1.Text = "Division"; - this.columnHeader1.Width = 186; - // - // fSPMaster - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(924, 539); - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.panel2); - this.Controls.Add(this.label2); - this.Controls.Add(this.panel1); - this.Controls.Add(this.bn); - this.Name = "fSPMaster"; - this.Text = "PMP DataBase"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private DSMssql dsMSSQL; - private System.Windows.Forms.BindingSource bs; - private DSMssqlTableAdapters.SPMasterTableAdapter ta; - private DSMssqlTableAdapters.TableAdapterManager tam; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.Panel panel1; - private FarPoint.Win.Spread.FpSpread fpSpread1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem 목록새로고침ToolStripMenuItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; - private System.Windows.Forms.ToolStripButton toolStripButton2; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox tbFind; - private System.Windows.Forms.ListView listView1; - private System.Windows.Forms.ColumnHeader columnHeader1; - } -} \ No newline at end of file diff --git a/SubProject/FPM0000/fSPMaster.cs b/SubProject/FPM0000/fSPMaster.cs deleted file mode 100644 index 69603ae..0000000 --- a/SubProject/FPM0000/fSPMaster.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FPM0000 -{ - public partial class fSPMaster :FCOMMON.fBase - { - int idx = -1; - public fSPMaster() - { - InitializeComponent(); - this.dsMSSQL.SPMaster.TableNewRow += minutes_TableNewRow; - - } - - void minutes_TableNewRow(object sender, DataTableNewRowEventArgs e) - { - //e.Row["wuid"] = FCOMMON.info.Login.no; - //e.Row["wdate"] = DateTime.Now; - //e.Row["stime"] = DateTime.Now; - //e.Row["etime"] = DateTime.Now.AddHours(1); - //e.Row["title"] = "Subject"; - } - - private void __Load(object sender, EventArgs e) - { - this.Show(); - Application.DoEvents(); - refreshDivision(); - } - void refreshData(string div) - { - - //refresh data - - // this.dv1.AutoResizeColumns(); - } - void refreshDivision() - { - //모든 디비젼을 가져와서 우측을 다시 생성한다 - var taDiv = new DSMssqlTableAdapters.DivListTableAdapter(); - var dt = taDiv.GetData(); - - this.listView1.Items.Clear(); - - var bta = this.listView1.Items.Add( "전체보기"); - bta.BackColor = Color.HotPink; - bta.Tag = ""; - - foreach(DSMssql.DivListRow dr in dt.Rows) - { - var bt = this.listView1.Items.Add(dr.Division); - bt.Tag = dr.Division; - } - - } - - private void listView1_SelectedIndexChanged(object sender, EventArgs e) - { - //지정된 Division을 필터링한다 - if (listView1.FocusedItem == null) return; - - ListViewItem bt = this.listView1.FocusedItem ; - if (bt.Tag.ToString() == "") - { - var dlg = Util.MsgQ("전체 보기는 데이터 통신량과 시간이 오래 소요됩니다\n" + - "Division을 알고 있다면 아래 Division 목록을 먼저 선택하고 검색 하세요"); - if (dlg != DialogResult.Yes) return; - - label2.Text = "전체보기"; - label2.Tag = ""; - this.ta.FillByAll(this.dsMSSQL.SPMaster); - } - else - { - label2.Text = bt.Text; - this.ta.Fill(this.dsMSSQL.SPMaster, bt.Tag.ToString()); - } - - label2.Tag = bt.Tag; - tbFind.Focus(); - tbFind.SelectAll(); - } - - - private void autoColumnSizeToolStripMenuItem_Click(object sender, EventArgs e) - { - // this.dv1.AutoResizeColumns(); - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - if(label2.Tag != null) - refreshData(label2.Tag.ToString()); - } - - private void dv1_DoubleClick(object sender, EventArgs e) - { - - } - - private void bs_CurrentChanged(object sender, EventArgs e) - { - idx = -1; - var drv = bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as DSMssql.SPMasterRow;//.minutesRow; - idx = dr.ID; - } - - private void toolStripButton2_Click(object sender, EventArgs e) - { - try - { - var cnt = this.ta.Update(this.dsMSSQL.SPMaster); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - } - } - - private void 목록새로고침ToolStripMenuItem_Click(object sender, EventArgs e) - { - refreshDivision(); - } - - void Find() - { - var txt = tbFind.Text.Trim(); - if (txt == "") - { - if(bs.Filter != "") - { - bs.Filter = ""; - tbFind.BackColor = Color.WhiteSmoke; - } - tbFind.Focus(); - return; - } - - //검색어가 잇으므로 검색을 수행한다 - var cols = new string[] { "SIDNo","Storage","Location", - "PartName","PartNo","Memo","CostCenter","Enrollee"}; - string filter = ""; - foreach(var col in cols) - { - if (filter != "") filter += " or "; - filter += col + " like '%"+ txt.Replace("'","''") +"%' "; - } - try - { - this.bs.Filter = filter; - tbFind.BackColor = Color.Lime; - tbFind.SelectAll(); - }catch (Exception ex) - { - this.bs.Filter = ""; - tbFind.BackColor = Color.Red; - Util.MsgE(ex.Message); - } - } - - private void button1_Click(object sender, EventArgs e) - { - Find(); - } - - private void tbFind_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - Find(); - } - - } -} diff --git a/SubProject/FPM0000/fSPMaster.resx b/SubProject/FPM0000/fSPMaster.resx deleted file mode 100644 index 13f7856..0000000 --- a/SubProject/FPM0000/fSPMaster.resx +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 321, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - - - 122, 17 - - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6 - VqHgsNxeMA03YN3lp/9vv4YYhAtsuQ6h55/9A8aBidVgPtiADZcegzWDFN1/9///qy8IDOKDcPfu1/9/ - /vn/v3rt/f9TD38BuwJuwIrT9wka0L79BdiAkuW3MA0A+fnog///V12GKAZ5BxcGGQByDYoXYAbA/Aey - AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs - 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG - GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= - - - - 17, 17 - - - 186, 17 - - - 248, 17 - - - 387, 17 - - - 539, 17 - - \ No newline at end of file