diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 50de32c..1e568b3 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("22.05.01.2100")] -[assembly: AssemblyFileVersion("22.05.01.2100")] +[assembly: AssemblyVersion("22.05.10.1115")] +[assembly: AssemblyFileVersion("22.05.10.1115")] diff --git a/Project/Properties/Settings.Designer.cs b/Project/Properties/Settings.Designer.cs index 88cc776..eab2aa6 100644 --- a/Project/Properties/Settings.Designer.cs +++ b/Project/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Project.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -33,26 +33,5 @@ namespace Project.Properties { return ((string)(this["gwcs"])); } } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:\\Temp\\PMP\\SPMaster.mdb")] - public string PMPCS { - get { - return ((string)(this["PMPCS"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.141.18.50;Initial Catalog=S1ACCESS300;Persist Security Info=True;U" + - "ser ID=amkoruser;Password=AmkorUser!")] - public string csAccess { - get { - return ((string)(this["csAccess"])); - } - } } } diff --git a/Project/Properties/Settings.settings b/Project/Properties/Settings.settings index 34bdcbf..a8b9c66 100644 --- a/Project/Properties/Settings.settings +++ b/Project/Properties/Settings.settings @@ -10,21 +10,5 @@ </SerializableConnectionString> Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:\Temp\PMP\SPMaster.mdb</ConnectionString> - <ProviderName>System.Data.OleDb</ProviderName> -</SerializableConnectionString> - Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:\Temp\PMP\SPMaster.mdb - - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=10.141.18.50;Initial Catalog=S1ACCESS300;Persist Security Info=True;User ID=amkoruser;Password=AmkorUser!</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=10.141.18.50;Initial Catalog=S1ACCESS300;Persist Security Info=True;User ID=amkoruser;Password=AmkorUser! - \ No newline at end of file diff --git a/Project/Util.cs b/Project/Util.cs index 1015f5f..0c03ea5 100644 --- a/Project/Util.cs +++ b/Project/Util.cs @@ -506,9 +506,20 @@ namespace Project public static void RunExplorer(string arg) { - System.Diagnostics.ProcessStartInfo si = new ProcessStartInfo("explorer"); - si.Arguments = arg; - System.Diagnostics.Process.Start(si); + if(arg.StartsWith("http")) + { + System.Diagnostics.Process.Start(arg); + + + } + else + { + + System.Diagnostics.ProcessStartInfo si = new ProcessStartInfo("explorer"); + si.Arguments = arg; + System.Diagnostics.Process.Start(si); + } + } #region "watchdog" diff --git a/Project/app.config b/Project/app.config index 3555a35..1472fda 100644 --- a/Project/app.config +++ b/Project/app.config @@ -2,17 +2,24 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index c74ddc9..68e28b5 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -17,6 +17,7 @@ namespace FBS0000 public WorkTable() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; var sd = DateTime.Now.ToString("yyyy-MM-01"); var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToShortDateString();// DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString(); diff --git a/SubProject/FBS0000/Holiday/fErrorChk.cs b/SubProject/FBS0000/Holiday/fErrorChk.cs index a951404..c35b082 100644 --- a/SubProject/FBS0000/Holiday/fErrorChk.cs +++ b/SubProject/FBS0000/Holiday/fErrorChk.cs @@ -15,6 +15,7 @@ namespace FBS0000.Holiday public fErrorChk() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; //dtSD.KeyDown += dtSD_KeyDown; //dtED.KeyDown += dtSD_KeyDown; diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.cs b/SubProject/FBS0000/Holiday/fHolyDayData.cs index 8c93d2d..b59964c 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs @@ -15,6 +15,7 @@ namespace FBS0000 public fHolyDayData(string sdate, string uid) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.WindowState = FormWindowState.Maximized; var dtUser = FCOMMON.DBM.getUserTable(); diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 00ec077..5fa2cf7 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -18,6 +18,7 @@ namespace FBS0000 public fHolyday() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + "i.ini"); this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow; //this.dv1.CellFormatting += dv1_CellFormatting; diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs index 33dd71f..490bce5 100644 --- a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs +++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs @@ -18,6 +18,7 @@ namespace FBS0000 public fHolydayJobReport(string sd,string ed ,string uid ) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.tbSD.Text = sd; this.tbED.Text = ed; p_uid = uid; diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 55a6457..99f1cf1 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -17,6 +17,7 @@ namespace FBS0000 public fHolyday_Add(dsMSSQL.HolydayRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dr = dr_; //if (idx == -1) //{ diff --git a/SubProject/FBS0000/Holiday/fImpKunTae.cs b/SubProject/FBS0000/Holiday/fImpKunTae.cs index fcd988b..e206b66 100644 --- a/SubProject/FBS0000/Holiday/fImpKunTae.cs +++ b/SubProject/FBS0000/Holiday/fImpKunTae.cs @@ -15,6 +15,7 @@ namespace FBS0000.Holiday public fImpKunTae() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; } private void fImpKunTae_Load(object sender, EventArgs e) diff --git a/SubProject/FBS0000/Holiday/fWorkTableUser.cs b/SubProject/FBS0000/Holiday/fWorkTableUser.cs index 1fe62a1..0567415 100644 --- a/SubProject/FBS0000/Holiday/fWorkTableUser.cs +++ b/SubProject/FBS0000/Holiday/fWorkTableUser.cs @@ -17,6 +17,7 @@ namespace FBS0000 public fWorkTableUser() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.EETGW_WorkTableUser.TableNewRow += Holyday_TableNewRow; //this.dv1.CellFormatting += dv1_CellFormatting; } diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.cs index 5f71d69..2362c6d 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.cs +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.cs @@ -14,6 +14,7 @@ namespace FBS0000 public rHolidaySummary() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.WindowState = FormWindowState.Maximized; } diff --git a/SubProject/FBS0000/fLovWorkUser.cs b/SubProject/FBS0000/fLovWorkUser.cs index 2a36420..6a45e9a 100644 --- a/SubProject/FBS0000/fLovWorkUser.cs +++ b/SubProject/FBS0000/fLovWorkUser.cs @@ -15,6 +15,7 @@ namespace FBS0000 public fLovWorkUser(List users) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.Merge(users.ToArray()); this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); }; } diff --git a/SubProject/FBS0000/fMinutes.cs b/SubProject/FBS0000/fMinutes.cs index e5fcffd..dab47a5 100644 --- a/SubProject/FBS0000/fMinutes.cs +++ b/SubProject/FBS0000/fMinutes.cs @@ -15,6 +15,7 @@ namespace FBS0000 public fMinutes() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.minutes.TableNewRow += minutes_TableNewRow; } diff --git a/SubProject/FBS0000/fMinutesDetail.cs b/SubProject/FBS0000/fMinutesDetail.cs index 04f6928..a810b72 100644 --- a/SubProject/FBS0000/fMinutesDetail.cs +++ b/SubProject/FBS0000/fMinutesDetail.cs @@ -15,6 +15,7 @@ namespace FBS0000 public fMinutesDetail(int idx_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; this.idx = idx_; } diff --git a/SubProject/FCM0000/Board/fPatchList.cs b/SubProject/FCM0000/Board/fPatchList.cs index 661dce0..b98f3e5 100644 --- a/SubProject/FCM0000/Board/fPatchList.cs +++ b/SubProject/FCM0000/Board/fPatchList.cs @@ -17,6 +17,7 @@ namespace FCM0000 public fPatchList() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.Board.TableNewRow += RequestItem_TableNewRow; } diff --git a/SubProject/FCM0000/Board/fRequestItem.cs b/SubProject/FCM0000/Board/fRequestItem.cs index 7db7e3e..e03d721 100644 --- a/SubProject/FCM0000/Board/fRequestItem.cs +++ b/SubProject/FCM0000/Board/fRequestItem.cs @@ -17,6 +17,7 @@ namespace FCM0000 public fRequestItem() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.RequestItem.TableNewRow += RequestItem_TableNewRow; } diff --git a/SubProject/FCM0000/Board/fRequestItem_Add.cs b/SubProject/FCM0000/Board/fRequestItem_Add.cs index eb3d73c..52de5a2 100644 --- a/SubProject/FCM0000/Board/fRequestItem_Add.cs +++ b/SubProject/FCM0000/Board/fRequestItem_Add.cs @@ -16,6 +16,7 @@ namespace FCM0000 public fRequestItem_Add(dsMSSQL.RequestItemRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; dr = dr_; PredefinedButtonSets.SetupDefaultButtons(this.tbRemark); } diff --git a/SubProject/FCM0000/Customer_Import.cs b/SubProject/FCM0000/Customer_Import.cs index ecb72ed..d40fec4 100644 --- a/SubProject/FCM0000/Customer_Import.cs +++ b/SubProject/FCM0000/Customer_Import.cs @@ -16,6 +16,7 @@ namespace FCM0000 public Customer_Import() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; } diff --git a/SubProject/FCM0000/Inventory/RepInvStock.cs b/SubProject/FCM0000/Inventory/RepInvStock.cs index b5aa572..5b7cb7f 100644 --- a/SubProject/FCM0000/Inventory/RepInvStock.cs +++ b/SubProject/FCM0000/Inventory/RepInvStock.cs @@ -14,6 +14,7 @@ namespace FCM0000.Inventory public RepInvStock() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; } private void RepInvStock_Load(object sender, EventArgs e) diff --git a/SubProject/FCM0000/Inventory/RepInvStockUser.cs b/SubProject/FCM0000/Inventory/RepInvStockUser.cs index 88390f9..0075937 100644 --- a/SubProject/FCM0000/Inventory/RepInvStockUser.cs +++ b/SubProject/FCM0000/Inventory/RepInvStockUser.cs @@ -1,34 +1,35 @@ -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 FCM0000.Inventory -{ - public partial class RepInvStockUser : Form - { - string userid = string.Empty; - public RepInvStockUser(string uid) - { - InitializeComponent(); - this.userid = uid; - } - - private void RepInvStock_Load(object sender, EventArgs e) - { - try - { - this.ta.Fill(this.dSReport.PersonInvStock, this.userid); - this.reportViewer1.RefreshReport(); - }catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - } - - } - } -} +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 FCM0000.Inventory +{ + public partial class RepInvStockUser : Form + { + string userid = string.Empty; + public RepInvStockUser(string uid) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.userid = uid; + } + + private void RepInvStock_Load(object sender, EventArgs e) + { + try + { + this.ta.Fill(this.dSReport.PersonInvStock, this.userid); + this.reportViewer1.RefreshReport(); + }catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + + } + } +} diff --git a/SubProject/FCM0000/Inventory/fInventory.cs b/SubProject/FCM0000/Inventory/fInventory.cs index 6270fbe..eca3285 100644 --- a/SubProject/FCM0000/Inventory/fInventory.cs +++ b/SubProject/FCM0000/Inventory/fInventory.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fInventory() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; this.dSInventory.vInventory.TableNewRow += Inventory_TableNewRow; this.dtSD.KeyDown += dtSD_KeyDown; diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs index 5257615..af81acf 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoList.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoList.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fInventoryJagoList() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; this.dtSD.KeyDown += dtSD_KeyDown; fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); diff --git a/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs b/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs index 094ba20..8e28db8 100644 --- a/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs +++ b/SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs @@ -1,80 +1,81 @@ -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 FCM0000.Inventory -{ - public partial class fInventoryJagoPlace : FCOMMON.fBase - { - public fInventoryJagoPlace(int itemIndex,string itemname) - { - - InitializeComponent(); - this.tbPumIDX.Text = itemIndex.ToString(); - this.tbPumName.Text = itemname; - 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) - { - this.Show(); - Application.DoEvents(); - button1.PerformClick(); - } - - private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - Lov_Item("", true); - } - void Lov_Item(string search, Boolean allowAll) - { - if (search == "" && allowAll == false) - { - FCOMMON.Util.MsgE("품명은 필수 값 입니다"); - tbPumName.Focus(); - return; - } - else if (search.ToLower() != tbPumName.Tag.ToString().ToLower() || tbPumIDX.Text == "-1" || tbPumIDX.Text == "") //값이 바뀌엇다면 검색을 해준다. - { - var f = new FCM0000.fLovItem(search); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - //인덱스값이 다르면 모델 및 가격을 업데이트 한다. - tbPumName.Text = f.itemName; - tbPumName.Tag = f.itemName; - - this.tbPumIDX.Text = f.item.ToString(); - //this.tbPumModel.Text = f.itemmodel; - //this.tbPumPrice.Text = f.itemprice.ToString(); - //this.tbSID.Text = f.SID; - //this.tbSID.Tag = f.SID; - //this.tbPumModel.Enabled = false; - //if (tbSID.Text != "") tbSID.Enabled = false; - //else tbSID.Enabled = true; - } - } - } - void refreshData() - { - var itmidx = 0; - if(!int.TryParse(tbPumIDX.Text,out itmidx)) - { - FCOMMON.Util.MsgE("품목을 먼저 선택하세요"); - return; - } - this.ta.FillByItemIdx(this.dSReport.jagosummaryPlace, FCOMMON.info.Login.gcode, DateTime.Now.ToShortDateString(), itmidx); - } - - - private void button1_Click(object sender, EventArgs e) - { - refreshData(); - } - } -} +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 FCM0000.Inventory +{ + public partial class fInventoryJagoPlace : FCOMMON.fBase + { + public fInventoryJagoPlace(int itemIndex,string itemname) + { + + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.tbPumIDX.Text = itemIndex.ToString(); + this.tbPumName.Text = itemname; + 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) + { + this.Show(); + Application.DoEvents(); + button1.PerformClick(); + } + + private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Lov_Item("", true); + } + void Lov_Item(string search, Boolean allowAll) + { + if (search == "" && allowAll == false) + { + FCOMMON.Util.MsgE("품명은 필수 값 입니다"); + tbPumName.Focus(); + return; + } + else if (search.ToLower() != tbPumName.Tag.ToString().ToLower() || tbPumIDX.Text == "-1" || tbPumIDX.Text == "") //값이 바뀌엇다면 검색을 해준다. + { + var f = new FCM0000.fLovItem(search); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + //인덱스값이 다르면 모델 및 가격을 업데이트 한다. + tbPumName.Text = f.itemName; + tbPumName.Tag = f.itemName; + + this.tbPumIDX.Text = f.item.ToString(); + //this.tbPumModel.Text = f.itemmodel; + //this.tbPumPrice.Text = f.itemprice.ToString(); + //this.tbSID.Text = f.SID; + //this.tbSID.Tag = f.SID; + //this.tbPumModel.Enabled = false; + //if (tbSID.Text != "") tbSID.Enabled = false; + //else tbSID.Enabled = true; + } + } + } + void refreshData() + { + var itmidx = 0; + if(!int.TryParse(tbPumIDX.Text,out itmidx)) + { + FCOMMON.Util.MsgE("품목을 먼저 선택하세요"); + return; + } + this.ta.FillByItemIdx(this.dSReport.jagosummaryPlace, FCOMMON.info.Login.gcode, DateTime.Now.ToShortDateString(), itmidx); + } + + + private void button1_Click(object sender, EventArgs e) + { + refreshData(); + } + } +} diff --git a/SubProject/FCM0000/Inventory/fInventoryUser.cs b/SubProject/FCM0000/Inventory/fInventoryUser.cs index 46d2c15..25623b9 100644 --- a/SubProject/FCM0000/Inventory/fInventoryUser.cs +++ b/SubProject/FCM0000/Inventory/fInventoryUser.cs @@ -14,6 +14,7 @@ namespace FCM0000 public fInventoryUser() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; this.dsMSSQL.InventoryUser.TableNewRow += Inventory_TableNewRow; diff --git a/SubProject/FCM0000/Inventory/finventoryAdd.cs b/SubProject/FCM0000/Inventory/finventoryAdd.cs index ee9ac6b..e015543 100644 --- a/SubProject/FCM0000/Inventory/finventoryAdd.cs +++ b/SubProject/FCM0000/Inventory/finventoryAdd.cs @@ -19,6 +19,7 @@ namespace FCM0000 public finventoryAdd(DSInventory.vInventoryRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; bsManu = new BindingSource(); bsModel = new BindingSource(); this.dr = dr_; diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index 107207e..b49d6cd 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -15,6 +15,7 @@ namespace FCM0000.Item public fItemAdd() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; foreach (Control ctl in this.Controls) { diff --git a/SubProject/FCM0000/Item/fItems.cs b/SubProject/FCM0000/Item/fItems.cs index 715a1ae..8a23d10 100644 --- a/SubProject/FCM0000/Item/fItems.cs +++ b/SubProject/FCM0000/Item/fItems.cs @@ -16,6 +16,8 @@ namespace FCM0000 public fItems() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.FormClosed += fItems_FormClosed; this.dsMSSQL.Items.TableNewRow += Items_TableNewRow; diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs index f3b69f9..5f5f598 100644 --- a/SubProject/FCM0000/Item/fLovItem.cs +++ b/SubProject/FCM0000/Item/fLovItem.cs @@ -28,6 +28,7 @@ namespace FCM0000 public fLovItem(string search_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); diff --git a/SubProject/FCM0000/Item/fLovOneItem.cs b/SubProject/FCM0000/Item/fLovOneItem.cs index 0df66af..56e86f4 100644 --- a/SubProject/FCM0000/Item/fLovOneItem.cs +++ b/SubProject/FCM0000/Item/fLovOneItem.cs @@ -1,100 +1,102 @@ -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 FCM0000 -{ - public partial class fLovOneItem : Form - { - public string Title { get; set; } - DataTable dt; - - public fLovOneItem(List lists) - { - InitializeComponent(); - this.StartPosition = FormStartPosition.CenterScreen; - Title = string.Empty; - dt = new DataTable(); - dt.Columns.Add("item"); - foreach (var item in lists) - dt.Rows.Add(new string[] { item }); - - this.KeyPreview = true; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - public fLovOneItem(Dictionary lists) - { - InitializeComponent(); - Title = string.Empty; - dt = new DataTable(); - dt.Columns.Add("item"); - dt.Columns.Add("Desc"); - foreach (var item in lists) - dt.Rows.Add(new string[] { item.Key ,item.Value}); - - this.KeyPreview = true; - this.KeyDown += (s1, e1) => - { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - private void fLovItem_Load(object sender, EventArgs e) - { - this.bs.DataSource = this.dt; - this.bn.BindingSource = this.bs; - this.dv.DataSource = this.bs; - - if(dv.Columns.Count > 1) - this.dv.Columns[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - else - this.dv.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - - - private void bs_CurrentChanged(object sender, EventArgs e) - { - - } - - private void dv_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - - btOK.PerformClick(); - } - - } - - private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) - { - Title = string.Empty; - return; - } - else - { - Title = drv[0].ToString(); - } - - if (Title.isEmpty()) DialogResult = System.Windows.Forms.DialogResult.Cancel; - else DialogResult = System.Windows.Forms.DialogResult.OK; - } - - private void dv_DoubleClick(object sender, EventArgs e) - { - btOK.PerformClick(); - } - } -} +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 FCM0000 +{ + public partial class fLovOneItem : Form + { + public string Title { get; set; } + DataTable dt; + + public fLovOneItem(List lists) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + + this.StartPosition = FormStartPosition.CenterScreen; + Title = string.Empty; + dt = new DataTable(); + dt.Columns.Add("item"); + foreach (var item in lists) + dt.Rows.Add(new string[] { item }); + + this.KeyPreview = true; + this.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + } + public fLovOneItem(Dictionary lists) + { + InitializeComponent(); + Title = string.Empty; + dt = new DataTable(); + dt.Columns.Add("item"); + dt.Columns.Add("Desc"); + foreach (var item in lists) + dt.Rows.Add(new string[] { item.Key ,item.Value}); + + this.KeyPreview = true; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + } + private void fLovItem_Load(object sender, EventArgs e) + { + this.bs.DataSource = this.dt; + this.bn.BindingSource = this.bs; + this.dv.DataSource = this.bs; + + if(dv.Columns.Count > 1) + this.dv.Columns[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + else + this.dv.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + + private void bs_CurrentChanged(object sender, EventArgs e) + { + + } + + private void dv_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + + btOK.PerformClick(); + } + + } + + private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + var drv = bs.Current as DataRowView; + if (drv == null) + { + Title = string.Empty; + return; + } + else + { + Title = drv[0].ToString(); + } + + if (Title.isEmpty()) DialogResult = System.Windows.Forms.DialogResult.Cancel; + else DialogResult = System.Windows.Forms.DialogResult.OK; + } + + private void dv_DoubleClick(object sender, EventArgs e) + { + btOK.PerformClick(); + } + } +} diff --git a/SubProject/FCM0000/Mail/fAutoSendSetting.cs b/SubProject/FCM0000/Mail/fAutoSendSetting.cs index 7400416..8ae9d12 100644 --- a/SubProject/FCM0000/Mail/fAutoSendSetting.cs +++ b/SubProject/FCM0000/Mail/fAutoSendSetting.cs @@ -15,6 +15,8 @@ namespace FCM0000.Mail public fAutoSendSetting() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.FormClosed += fAutoSendSetting_FormClosed; fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); } diff --git a/SubProject/FCM0000/Mail/fJRForm.cs b/SubProject/FCM0000/Mail/fJRForm.cs index e9f8a69..ad14ec9 100644 --- a/SubProject/FCM0000/Mail/fJRForm.cs +++ b/SubProject/FCM0000/Mail/fJRForm.cs @@ -15,6 +15,8 @@ namespace FCM0000 public fJRForm() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.dsMSSQL1.EETGW_DocuForm.TableNewRow += MailForm_TableNewRow; } diff --git a/SubProject/FCM0000/Mail/fMailAutoAdd.cs b/SubProject/FCM0000/Mail/fMailAutoAdd.cs index 3539556..dd3c53b 100644 --- a/SubProject/FCM0000/Mail/fMailAutoAdd.cs +++ b/SubProject/FCM0000/Mail/fMailAutoAdd.cs @@ -16,6 +16,8 @@ namespace FCM0000 public fMailAutoAdd(DSMail.MailAutoRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + PredefinedButtonSets.SetupDefaultButtons(this.tbBody); this.dr = dr_; } diff --git a/SubProject/FCM0000/Mail/fMailBackup.cs b/SubProject/FCM0000/Mail/fMailBackup.cs index 3c5b376..0925648 100644 --- a/SubProject/FCM0000/Mail/fMailBackup.cs +++ b/SubProject/FCM0000/Mail/fMailBackup.cs @@ -18,6 +18,8 @@ namespace FCM0000.Mail public fMailBackup() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + dateTimePicker1.Value = DateTime.Now.AddYears(-2); dateTimePicker2.Value = DateTime.Now.AddYears(-1); } diff --git a/SubProject/FCM0000/Mail/fMailList.cs b/SubProject/FCM0000/Mail/fMailList.cs index e8c4043..1738fd4 100644 --- a/SubProject/FCM0000/Mail/fMailList.cs +++ b/SubProject/FCM0000/Mail/fMailList.cs @@ -15,6 +15,7 @@ namespace FCM0000.Mail public fMailList() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += fAutoSendSetting_FormClosed; fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); } diff --git a/SubProject/FCM0000/Mail/fMailform.cs b/SubProject/FCM0000/Mail/fMailform.cs index a65e53a..96d4caf 100644 --- a/SubProject/FCM0000/Mail/fMailform.cs +++ b/SubProject/FCM0000/Mail/fMailform.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fMailform() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; PredefinedButtonSets.SetupDefaultButtons(this.htmlEditor1); this.dsMSSQL.MailForm.TableNewRow += MailForm_TableNewRow; } diff --git a/SubProject/FCM0000/Mail/fSendMail.cs b/SubProject/FCM0000/Mail/fSendMail.cs index e4c837c..fe331fc 100644 --- a/SubProject/FCM0000/Mail/fSendMail.cs +++ b/SubProject/FCM0000/Mail/fSendMail.cs @@ -15,11 +15,10 @@ namespace FCM0000 { public partial class fSendMail : FCOMMON.fBase { - - public fSendMail() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; PredefinedButtonSets.SetupDefaultButtons(this.tbBody); this.dsMSSQL.MailData.TableNewRow += MailForm_TableNewRow; } diff --git a/SubProject/FCM0000/User/fLovUser.cs b/SubProject/FCM0000/User/fLovUser.cs index 300dbf6..24132e8 100644 --- a/SubProject/FCM0000/User/fLovUser.cs +++ b/SubProject/FCM0000/User/fLovUser.cs @@ -1,117 +1,118 @@ -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 FCM0000 -{ - public partial class fLovUser : FCOMMON.fBase - { - string fn_fpcolsize = ""; - string keyword = string.Empty; - - public string userEmail { get; set; } - public string userID { get; set; } - public string userName { get; set; } - public string userTel { get; set; } - - - public fLovUser(string search_) - { - InitializeComponent(); - fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); - this.keyword = search_; - this.fpSpread1.KeyDown += fpSpread1_KeyDown; - this.fpSpread1.CellDoubleClick += fpSpread1_CellDoubleClick; - - //clear data - userEmail = string.Empty; - userID = string.Empty; - userName = string.Empty; - userTel = string.Empty; - } - - void fpSpread1_CellDoubleClick(object sender, FarPoint.Win.Spread.CellClickEventArgs e) - { - btOK.PerformClick(); - } - - void fpSpread1_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - btOK.PerformClick(); - } - } - - private void fLovItem_Load(object sender, EventArgs e) - { - this.Text = string.Format("사용자선택({0})",this.keyword); - this.Show(); - Application.DoEvents(); - refreshData(); - } - - void refreshData() - { - - try - { - if (keyword == "" || keyword == "%" || keyword == "%%") this.ta.Fill(this.dSUser.Users); - else this.ta.FillBySearch(this.dSUser.Users, keyword ); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - catch (Exception eX) - { - FCOMMON.Util.MsgE(eX.Message); - } - } - - - private void btSelect_Cliock(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) return; - else - { - var dr = drv.Row as DSUser.UsersRow;//.CustomsRow; - userID = dr.id; - userName = dr.name; - userEmail = dr.email; - userTel = dr.tel; - } - DialogResult = System.Windows.Forms.DialogResult.OK; - } - - - 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 exportListToolStripMenuItem_Click(object sender, EventArgs e) - { - SaveFileDialog sd = new SaveFileDialog(); - sd.Filter = "excel|*.xls"; - sd.FileName = "userlist.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); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); - } - } - } -} +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 FCM0000 +{ + public partial class fLovUser : FCOMMON.fBase + { + string fn_fpcolsize = ""; + string keyword = string.Empty; + + public string userEmail { get; set; } + public string userID { get; set; } + public string userName { get; set; } + public string userTel { get; set; } + + + public fLovUser(string search_) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); + this.keyword = search_; + this.fpSpread1.KeyDown += fpSpread1_KeyDown; + this.fpSpread1.CellDoubleClick += fpSpread1_CellDoubleClick; + + //clear data + userEmail = string.Empty; + userID = string.Empty; + userName = string.Empty; + userTel = string.Empty; + } + + void fpSpread1_CellDoubleClick(object sender, FarPoint.Win.Spread.CellClickEventArgs e) + { + btOK.PerformClick(); + } + + void fpSpread1_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + btOK.PerformClick(); + } + } + + private void fLovItem_Load(object sender, EventArgs e) + { + this.Text = string.Format("사용자선택({0})",this.keyword); + this.Show(); + Application.DoEvents(); + refreshData(); + } + + void refreshData() + { + + try + { + if (keyword == "" || keyword == "%" || keyword == "%%") this.ta.Fill(this.dSUser.Users); + else this.ta.FillBySearch(this.dSUser.Users, keyword ); + FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } + catch (Exception eX) + { + FCOMMON.Util.MsgE(eX.Message); + } + } + + + private void btSelect_Cliock(object sender, EventArgs e) + { + var drv = bs.Current as DataRowView; + if (drv == null) return; + else + { + var dr = drv.Row as DSUser.UsersRow;//.CustomsRow; + userID = dr.id; + userName = dr.name; + userEmail = dr.email; + userTel = dr.tel; + } + DialogResult = System.Windows.Forms.DialogResult.OK; + } + + + 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 exportListToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveFileDialog sd = new SaveFileDialog(); + sd.Filter = "excel|*.xls"; + sd.FileName = "userlist.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); + FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + } + } + } +} diff --git a/SubProject/FCM0000/User/fUserAuth.cs b/SubProject/FCM0000/User/fUserAuth.cs index 2db5739..8e81b30 100644 --- a/SubProject/FCM0000/User/fUserAuth.cs +++ b/SubProject/FCM0000/User/fUserAuth.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fUserAuth() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; fn_fpcolsize1 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp1_" + this.Name + ".ini"); } diff --git a/SubProject/FCM0000/User/fUserGroup.cs b/SubProject/FCM0000/User/fUserGroup.cs index bc8c824..8606362 100644 --- a/SubProject/FCM0000/User/fUserGroup.cs +++ b/SubProject/FCM0000/User/fUserGroup.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fUserGroup() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; fn_fpcolsize1 = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp1_" + this.Name + ".ini"); } diff --git a/SubProject/FCM0000/User/fUserGroupPermission.cs b/SubProject/FCM0000/User/fUserGroupPermission.cs index 25df461..bb56817 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.cs +++ b/SubProject/FCM0000/User/fUserGroupPermission.cs @@ -15,6 +15,7 @@ namespace FCM0000 public fUserGroupPermission(int permission_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.permission = permission_; } diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index 58e0d92..571eee5 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -14,6 +14,7 @@ namespace FCM0000 public fCode() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.dsMSSQL.Common.TableNewRow += Common_TableNewRow; if (FCOMMON.info.Login.level >= 9) toolStripButton1.Visible = true; } diff --git a/SubProject/FCM0000/fCustoms.cs b/SubProject/FCM0000/fCustoms.cs index 02a3b6a..720b060 100644 --- a/SubProject/FCM0000/fCustoms.cs +++ b/SubProject/FCM0000/fCustoms.cs @@ -16,7 +16,7 @@ namespace FCM0000 public fCustoms() { InitializeComponent(); - + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; 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"); } diff --git a/SubProject/FCM0000/fHolidaytable.cs b/SubProject/FCM0000/fHolidaytable.cs index b442fa8..9c201db 100644 --- a/SubProject/FCM0000/fHolidaytable.cs +++ b/SubProject/FCM0000/fHolidaytable.cs @@ -17,6 +17,7 @@ namespace FCM0000 public fHolidaytable() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.StartPosition = FormStartPosition.CenterScreen; this.KeyPreview = true; this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); }; diff --git a/SubProject/FCM0000/fLovProject.cs b/SubProject/FCM0000/fLovProject.cs index 977a6e0..630d1e5 100644 --- a/SubProject/FCM0000/fLovProject.cs +++ b/SubProject/FCM0000/fLovProject.cs @@ -19,6 +19,8 @@ namespace FCM0000 public fLovProject(string search_, string stat_ = "") { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Title = string.Empty; Index = -1; diff --git a/SubProject/FCM0000/fLovSupply.cs b/SubProject/FCM0000/fLovSupply.cs index b3664e6..5d5daad 100644 --- a/SubProject/FCM0000/fLovSupply.cs +++ b/SubProject/FCM0000/fLovSupply.cs @@ -1,78 +1,80 @@ -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 FCM0000 -{ - public partial class fLovSupply : Form - { - public string Title { get; set; } - public int Index { get; set; } - - string keyword = string.Empty; - public fLovSupply(string search_) - { - InitializeComponent(); - Title = string.Empty; - Index = -1; - - this.keyword = search_; - this.KeyPreview = true; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - - private void fLovItem_Load(object sender, EventArgs e) - { - this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%",FCOMMON.info.Login.gcode); - } - - - private void bs_CurrentChanged(object sender, EventArgs e) - { - - } - - private void dv_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - - btOK.PerformClick(); - } - - } - - private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) - { - Title = string.Empty; - Index = -1; - return; - } - else - { - var dr = drv.Row as dsMSSQL.CustomsRow; - Index = dr.idx; - Title = dr.name; - } - - if (Title.isEmpty() || Index == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel; - else DialogResult = System.Windows.Forms.DialogResult.OK; - } - - private void dv_DoubleClick(object sender, EventArgs e) - { - btOK.PerformClick(); - } - } -} +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 FCM0000 +{ + public partial class fLovSupply : Form + { + public string Title { get; set; } + public int Index { get; set; } + + string keyword = string.Empty; + public fLovSupply(string search_) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + + Title = string.Empty; + Index = -1; + + this.keyword = search_; + this.KeyPreview = true; + this.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + } + + private void fLovItem_Load(object sender, EventArgs e) + { + this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%",FCOMMON.info.Login.gcode); + } + + + private void bs_CurrentChanged(object sender, EventArgs e) + { + + } + + private void dv_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + + btOK.PerformClick(); + } + + } + + private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + var drv = bs.Current as DataRowView; + if (drv == null) + { + Title = string.Empty; + Index = -1; + return; + } + else + { + var dr = drv.Row as dsMSSQL.CustomsRow; + Index = dr.idx; + Title = dr.name; + } + + if (Title.isEmpty() || Index == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel; + else DialogResult = System.Windows.Forms.DialogResult.OK; + } + + private void dv_DoubleClick(object sender, EventArgs e) + { + btOK.PerformClick(); + } + } +} diff --git a/SubProject/FCM0000/fMaterial_Import.cs b/SubProject/FCM0000/fMaterial_Import.cs index aaba9f8..1b5bf9b 100644 --- a/SubProject/FCM0000/fMaterial_Import.cs +++ b/SubProject/FCM0000/fMaterial_Import.cs @@ -16,6 +16,7 @@ namespace FCM0000 public fMaterial_Import() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; this.FormClosed += __Closed; } diff --git a/SubProject/FCM0000/fSelectDate.cs b/SubProject/FCM0000/fSelectDate.cs index b26a08c..5ce4555 100644 --- a/SubProject/FCM0000/fSelectDate.cs +++ b/SubProject/FCM0000/fSelectDate.cs @@ -1,45 +1,46 @@ -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 FCM0000 -{ - public partial class fSelectDate : Form - { - private DateTime _dtSelect = DateTime.Now; - public DateTime dtSelect - { - get - { - return _dtSelect; - } - set - { - _dtSelect = value; - } - } - - public fSelectDate(string dtstr) : this(DateTime.Parse(dtstr)) { } - public fSelectDate(DateTime dt) - { - InitializeComponent(); - this.monthCalendar1.SetDate(dt); - } - - private void fSelectDate_Load(object sender, EventArgs e) - { - - } - - private void btOK_Click(object sender, EventArgs e) - { - dtSelect = this.monthCalendar1.SelectionStart; - DialogResult = System.Windows.Forms.DialogResult.OK; - } - } -} +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 FCM0000 +{ + public partial class fSelectDate : Form + { + private DateTime _dtSelect = DateTime.Now; + public DateTime dtSelect + { + get + { + return _dtSelect; + } + set + { + _dtSelect = value; + } + } + + public fSelectDate(string dtstr) : this(DateTime.Parse(dtstr)) { } + public fSelectDate(DateTime dt) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + this.monthCalendar1.SetDate(dt); + } + + private void fSelectDate_Load(object sender, EventArgs e) + { + + } + + private void btOK_Click(object sender, EventArgs e) + { + dtSelect = this.monthCalendar1.SelectionStart; + DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} diff --git a/SubProject/FED0000/Education/fEdulist.cs b/SubProject/FED0000/Education/fEdulist.cs index d28e808..2193ef3 100644 --- a/SubProject/FED0000/Education/fEdulist.cs +++ b/SubProject/FED0000/Education/fEdulist.cs @@ -18,6 +18,11 @@ namespace FED0000 public fEdulist() { InitializeComponent(); + + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + + fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.dsPurchase.EETGW_EducationList.TableNewRow += Purchase_TableNewRow; this.FormClosing += FPurchase_FormClosing; diff --git a/SubProject/FED0000/License/fLicenseList.cs b/SubProject/FED0000/License/fLicenseList.cs index 9da50d2..4ebbfb4 100644 --- a/SubProject/FED0000/License/fLicenseList.cs +++ b/SubProject/FED0000/License/fLicenseList.cs @@ -18,6 +18,9 @@ namespace FED0000 public fLicenseList() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.dsPurchase.EETGW_License.TableNewRow += Purchase_TableNewRow; this.FormClosing += FPurchase_FormClosing; diff --git a/SubProject/FEQ0000/Equipment/EQFilterApply.cs b/SubProject/FEQ0000/Equipment/EQFilterApply.cs index 8400ab9..ddabb57 100644 --- a/SubProject/FEQ0000/Equipment/EQFilterApply.cs +++ b/SubProject/FEQ0000/Equipment/EQFilterApply.cs @@ -17,6 +17,8 @@ namespace FEQ0000 public EQFilterApply(string type_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; this.eqfiletertype = type_; this.FormClosed += __Closed; } diff --git a/SubProject/FEQ0000/Equipment/EQfilterManager.cs b/SubProject/FEQ0000/Equipment/EQfilterManager.cs index 78532ae..5d65139 100644 --- a/SubProject/FEQ0000/Equipment/EQfilterManager.cs +++ b/SubProject/FEQ0000/Equipment/EQfilterManager.cs @@ -15,6 +15,8 @@ namespace FEQ0000 public EQfilterManager(string type_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; divtype = type_; this.dsEQ.EquipmentFilter.TableNewRow += EquipmentFilter_TableNewRow; } diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index 70e0c16..63fa62b 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -29,6 +29,9 @@ namespace FEQ0000 public fEquipment(eTabletype type_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + dataType = type_; this.tbSearch.KeyDown += (s1, e1) => { diff --git a/SubProject/FEQ0000/Equipment/fImpEquipment.cs b/SubProject/FEQ0000/Equipment/fImpEquipment.cs index b9fd4fb..7e0e215 100644 --- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs @@ -17,6 +17,9 @@ namespace FEQ0000 public fImpEquipment(fEquipment.eTabletype type_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + this.FormClosed += __Closed; dt = new dsEQ.EETGW_EquipmentDataTable(); } diff --git a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs index a552ffc..560b41c 100644 --- a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs +++ b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs @@ -16,6 +16,9 @@ namespace FEQ0000 { //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory); InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + this.dt = dt_; this.Text = "Equipment List(" + title + ")"; } diff --git a/SubProject/FEQ0000/Purchase/fInputSC.cs b/SubProject/FEQ0000/Purchase/fInputSC.cs index d820c85..e07ed6a 100644 --- a/SubProject/FEQ0000/Purchase/fInputSC.cs +++ b/SubProject/FEQ0000/Purchase/fInputSC.cs @@ -15,6 +15,8 @@ namespace FEQ0000.Purchase public fInputSC() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } } } diff --git a/SubProject/FEQ0000/Purchase/fMailForm.cs b/SubProject/FEQ0000/Purchase/fMailForm.cs index 6f1605b..ae7fbdb 100644 --- a/SubProject/FEQ0000/Purchase/fMailForm.cs +++ b/SubProject/FEQ0000/Purchase/fMailForm.cs @@ -15,6 +15,8 @@ namespace FEQ0000.Purchase public fMailForm() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } private void fMailForm_Load(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 1782312..2c0c402 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -21,6 +21,9 @@ namespace FEQ0000 public fPurchase() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow; this.FormClosing += FPurchase_FormClosing; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs b/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs index c0b28de..6dbdb0e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs @@ -15,6 +15,9 @@ namespace FEQ0000 public fPurchaseNRList(dsPurchase.PurchaseDataTable dt) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + this.ds1.Purchase.Merge(dt); this.ds1.AcceptChanges(); } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 7b91e26..c437cdb 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -19,6 +19,9 @@ namespace FEQ0000 public fPurchase_Add(dsPurchase.PurchaseRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + bsManu = new BindingSource(); bsModel = new BindingSource(); this.dr = dr_; diff --git a/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs b/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs index 117a677..369f668 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs @@ -18,6 +18,9 @@ namespace FEQ0000 public fPurchase_AddS(dsPurchase.PurchaseRow dr_) { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + bsManu = new BindingSource(); bsModel = new BindingSource(); this.dr = dr_; diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Data.cs b/SubProject/FEQ0000/Purchase/fPurchase_Data.cs index 7627365..0d59885 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Data.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Data.cs @@ -14,6 +14,8 @@ namespace FEQ0000 public fPurchase_Data() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } private void button1_Click(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs index 2c3e753..b062291 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs @@ -16,6 +16,8 @@ namespace FEQ0000 public fPurchase_Import() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; this.FormClosed += __Closed; } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs b/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs index 85adef3..f7c922d 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs @@ -16,6 +16,8 @@ namespace FEQ0000 public fPurchase_ImportO() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; this.FormClosed += __Closed; } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs index a809ed2..b16464d 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs @@ -15,6 +15,8 @@ namespace FEQ0000 public fPurchase_excelimport() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; this.FormClosed += __Closed; } diff --git a/SubProject/FEQ0000/Purchase/rPurchase.cs b/SubProject/FEQ0000/Purchase/rPurchase.cs index d5c3a75..380bda7 100644 --- a/SubProject/FEQ0000/Purchase/rPurchase.cs +++ b/SubProject/FEQ0000/Purchase/rPurchase.cs @@ -14,6 +14,8 @@ namespace FEQ0000.Purchase public rPurchase() { InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; } private void rPurchase_Load(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs index adf0fdb..6c7d773 100644 --- a/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs +++ b/SubProject/FPJ0000/JobReport_/fJobChartMenu.cs @@ -17,6 +17,12 @@ namespace FPJ0000.JobReport_ public fJobChartMenu() { InitializeComponent(); + + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntitiesLayout"] = FCOMMON.info.CS; + + this.dts.Value = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")); this.dte.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-01")).AddDays(-1); } diff --git a/SubProject/FPM0000/fSPMaster.cs b/SubProject/FPM0000/fSPMaster.cs index 31fdaa8..69603ae 100644 --- a/SubProject/FPM0000/fSPMaster.cs +++ b/SubProject/FPM0000/fSPMaster.cs @@ -16,6 +16,7 @@ namespace FPM0000 { InitializeComponent(); this.dsMSSQL.SPMaster.TableNewRow += minutes_TableNewRow; + } void minutes_TableNewRow(object sender, DataTableNewRowEventArgs e)