From b6607dde2d078204bd7b63106291c45dd51491e1 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 20 Apr 2022 15:09:23 +0900 Subject: [PATCH] .... --- Project/Dialog/fLogin.cs | 653 ++--- Project/Properties/AssemblyInfo.cs | 4 +- Project/dsMSSQL.Designer.cs | 156 +- Project/dsMSSQL.cs | 6 +- Project/dsMSSQL.xsd | 56 +- Project/dsMSSQL.xss | 16 +- Project/fMain.Designer.cs | 1807 ++++++------ Project/fMain.cs | 23 +- Project/fMain.resx | 10 + SubProject/FBS0000/Holiday/WorkTable.cs | 6 +- .../FBS0000/Holiday/fHolyday.Designer.cs | 290 +- SubProject/FBS0000/Holiday/fHolyday.resx | 104 +- .../FBS0000/Holiday/fHolyday_Add.Designer.cs | 65 +- SubProject/FBS0000/Holiday/fHolyday_Add.cs | 15 +- SubProject/FBS0000/Holiday/fHolyday_Add.resx | 3 + SubProject/FCOMMON/DataBaseManager.cs | 2411 +++++++++-------- .../FEQ0000/Purchase/fPurchase.Designer.cs | 219 +- SubProject/FEQ0000/Purchase/fPurchase.cs | 25 +- SubProject/FEQ0000/Purchase/fPurchase.resx | 44 +- .../FPJ0000/JobReport_/fJobReport_Add.cs | 1437 +++++----- .../FPJ0000/JobReport_/rJobReportUser.cs | 2 +- SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs | 30 - .../FPJ0000/Project/fProjectSchedule.cs | 8 +- 23 files changed, 3858 insertions(+), 3532 deletions(-) diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 254edb3..6b57cec 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -11,353 +11,372 @@ using System.Windows.Forms; namespace Project.Dialog { - public partial class fLogin : Form - { - public fLogin() - { - InitializeComponent(); - this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); }; - this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); }; - this.KeyPreview = true; - this.KeyDown += (s1, e1) => - { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); - } - private void fLogin_Load(object sender, EventArgs e) - { - var list = Pub.setting.lastid.Split(';'); - foreach (var item in list) - if (item != "") tbID.Items.Add(item); - if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; + public partial class fLogin : Form + { + public fLogin() + { + InitializeComponent(); + this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); }; + this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); }; + this.KeyPreview = true; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); + } + private void fLogin_Load(object sender, EventArgs e) + { + var list = Pub.setting.lastid.Split(';'); + foreach (var item in list) + if (item != "") tbID.Items.Add(item); + if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; - //S1 사용자 그룹목록 확인 - //var tas1 = new S1ACCESS300Entities(); - //var deptlist = tas1.VIEW_CARD_PERSON - // .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false) - // .GroupBy(t => t.PersonUser2) - // .OrderBy(t => t.Key) - // .ToList(); + //S1 사용자 그룹목록 확인 + //var tas1 = new S1ACCESS300Entities(); + //var deptlist = tas1.VIEW_CARD_PERSON + // .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false) + // .GroupBy(t => t.PersonUser2) + // .OrderBy(t => t.Key) + // .ToList(); - //this.cmbDept.Items.Clear(); - //foreach (var dept in deptlist) - // cmbDept.Items.Add(dept); + //this.cmbDept.Items.Clear(); + //foreach (var dept in deptlist) + // cmbDept.Items.Add(dept); - //그룹목록가져오기 - var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter(); - var grplist = tagrp.GetData(); - this.cmbDept.DataSource = grplist; - this.cmbDept.DisplayMember = "dept"; - this.cmbDept.ValueMember = "gcode"; + //그룹목록가져오기 + var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter(); + var grplist = tagrp.GetData(); + this.cmbDept.DataSource = grplist; + this.cmbDept.DisplayMember = "dept"; + this.cmbDept.ValueMember = "gcode"; - //마지막으로사용한 부서이름 - if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; - else this.cmbDept.Text = Pub.setting.lastdpt; - //foreach (var item in dlist) - // if (item != "") this.cmbDept.Items.Add(item); - //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; + //마지막으로사용한 부서이름 + if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; + else this.cmbDept.Text = Pub.setting.lastdpt; + //foreach (var item in dlist) + // if (item != "") this.cmbDept.Items.Add(item); + //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; - this.Show(); - Application.DoEvents(); + this.Show(); + Application.DoEvents(); - if (this.tbID.Text.isEmpty() == false) tbPW.Focus(); - else tbID.Focus(); - } - private void button1_Click(object sender, EventArgs e) - { + if (this.tbID.Text.isEmpty() == false) tbPW.Focus(); + else tbID.Focus(); + } + private void button1_Click(object sender, EventArgs e) + { - if (this.tbID.Text.isEmpty()) - { - tbID.Focus(); - return; - } - if (this.tbPW.Text.isEmpty()) - { - tbPW.Focus(); - return; - } - if (cmbDept.SelectedIndex < 0) - { - FCOMMON.Util.MsgE("소속 부서를 선택하세요"); - cmbDept.Focus(); - return; - } + if (this.tbID.Text.isEmpty()) + { + tbID.Focus(); + return; + } + if (this.tbPW.Text.isEmpty()) + { + tbPW.Focus(); + return; + } + if (cmbDept.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("소속 부서를 선택하세요"); + cmbDept.Focus(); + return; + } - List idlist = new List(); - idlist.Add(tbID.Text.Trim()); - foreach (var item in this.tbID.Items) - if (idlist.Contains(item) == false) idlist.Add(item.ToString()); + List idlist = new List(); + idlist.Add(tbID.Text.Trim()); + foreach (var item in this.tbID.Items) + if (idlist.Contains(item) == false) idlist.Add(item.ToString()); - //List deptlist = new List(); - //deptlist.Add(cmbDept.Text.Trim()); - //foreach (var item in this.cmbDept.Items) - // if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); + //List deptlist = new List(); + //deptlist.Add(cmbDept.Text.Trim()); + //foreach (var item in this.cmbDept.Items) + // if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); - //180605 - var vuserlist = ""; - foreach (var item in idlist) - vuserlist += ";" + item; + //180605 + var vuserlist = ""; + foreach (var item in idlist) + vuserlist += ";" + item; - //var vdeptlist = ""; - //foreach(var item in deptlist) - // vdeptlist += ";" + item; + //var vdeptlist = ""; + //foreach(var item in deptlist) + // vdeptlist += ";" + item; - var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; + var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; - Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); - Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 - Pub.setting.Save(); + Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); + Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 + Pub.setting.Save(); - var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); - var ta = new dsMSSQLTableAdapters.UsersTableAdapter(); - try - { - var users = ta.GetIDPW(encpass, tbID.Text.Trim()); - if (users.Rows.Count != 1) - { - users = ta.GetByNamePw(tbID.Text.Trim(), encpass); - if (users.Rows.Count != 1) - { - Util.MsgE("입력한 사용자 계정이 존재하지 않습니다"); - tbPW.SelectAll(); - tbPW.Focus(); - return; - } - } + var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); + var id = tbID.Text.Trim(); + //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter(); + try + { + var userGcode=FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{id}','{encpass}')"); + //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString(); + if (String.IsNullOrEmpty(userGcode)) + { + Util.MsgE("입력한 사용자 계정이 존재하지 않습니다\n관리자에 문의 하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + else if (userGcode.StartsWith("@ERR")) + { + Util.MsgE("접속실패\n\n" + userGcode.Substring(3)); + return; + } - //이사용자의 부서 코드확인 - var userdr = users.Rows[0] as dsMSSQL.UsersRow; - var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter(); - var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0; - if (userdr.level < 9 && Exist == false) - { - Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); - return; - } + //이사용자의 부서 코드확인 + var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter(); + var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow; - if (userdr.outdate.isEmpty() == false) - { - if (DateTime.TryParse(userdr.outdate, out DateTime dtout)) - { - if (DateTime.Now > dtout) - { - Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다"); - return; - } - } - else - { - Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다"); - return; - } - } + //var userdr = users.Rows[0] as dsMSSQL.UsersRow; + //var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter(); + //var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0; + //if (userdr.level < 9 && Exist == false) + //{ + // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + // return; + //} - FCOMMON.info.Login.no = userdr.id; - FCOMMON.info.Login.nameK = userdr.name; - FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; - FCOMMON.info.Login.level = userdr.level; - FCOMMON.info.Login.email = userdr.email; - FCOMMON.info.Login.nameE = userdr.nameE; - FCOMMON.info.Login.hp = userdr.hp; - FCOMMON.info.Login.tel = userdr.tel; - FCOMMON.info.Login.title = userdr.ads_title; - FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; - //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); - var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); - FCOMMON.info.Login.gcode = gCode;// gcode; - FCOMMON.info.Login.process = userdr.processs; - FCOMMON.info.Login.permission = 0; - FCOMMON.info.Login.gpermission = int.Parse(gperm); - FCOMMON.info.datapath = Pub.setting.SharedDataPath; - FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 - - if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 - FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; - - using (var dbEnity = new EEEntitiesMain()) - { - var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); - if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : ""); - else FCOMMON.info.Login.process = drGrpUser.Process; - } - - //로그인정보 기록 - AddLoginInfo(); - - //210221 - MakeAutoJobReportbyLogin(); - - //210613 - MakeAutoJobReportByAuto(); - - DialogResult = DialogResult.OK; - } - catch (Exception ex) - { - Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); - DialogResult = System.Windows.Forms.DialogResult.Cancel; - } - } - - /// - /// 무조건 업무일지를 자동으로 작성하는 경우 - /// - void MakeAutoJobReportByAuto() - { - //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다. - - var dbi = new EEEntitiesMain(); - var db = new EEEntitiesMain(); - var nd = DateTime.Now.ToShortDateString(); - - //이 날짜가 휴일인지 체크한다. - var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault(); - if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return; + //if (userdr.outdate.isEmpty() == false) + //{ + // if (DateTime.TryParse(userdr.outdate, out DateTime dtout)) + // { + // if (DateTime.Now > dtout) + // { + // Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다"); + // return; + // } + // } + // else + // { + // Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다"); + // return; + // } + //} - //토,일은 처리하지 않음 - if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return; + var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + if (MaxVerstion.isEmpty() == false) + { + var curversion = Application.ProductVersion; + var verchk = curversion.CompareTo(MaxVerstion); + if (verchk < 0) + { + //내버젼이 낮다 + Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + } + } - - var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable==true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); - foreach (var dr in rows) - { - //퇴사자 확인 - var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault(); - if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; + FCOMMON.info.Login.no = userdr.id; + FCOMMON.info.Login.nameK = userdr.name; + FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; + FCOMMON.info.Login.level = userdr.level; + FCOMMON.info.Login.email = userdr.email; + FCOMMON.info.Login.nameE = userdr.nameE; + FCOMMON.info.Login.hp = userdr.hp; + FCOMMON.info.Login.tel = userdr.tel; + FCOMMON.info.Login.title = userdr.ads_title; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gCode;// gcode; + FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자": userdr.processs; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + FCOMMON.info.datapath = Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 - + if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 + FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; + + //using (var dbEnity = new EEEntitiesMain()) + //{ + // var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); + // if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : ""); + // else FCOMMON.info.Login.process = drGrpUser.Process; + //} + + //로그인정보 기록 + AddLoginInfo(); + + //210221 + MakeAutoJobReportbyLogin(); + + //210613 + MakeAutoJobReportByAuto(); + + DialogResult = DialogResult.OK; + } + catch (Exception ex) + { + Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); + DialogResult = System.Windows.Forms.DialogResult.Cancel; + } + } + + /// + /// 무조건 업무일지를 자동으로 작성하는 경우 + /// + void MakeAutoJobReportByAuto() + { + //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다. + + var dbi = new EEEntitiesMain(); + var db = new EEEntitiesMain(); + var nd = DateTime.Now.ToShortDateString(); + + //이 날짜가 휴일인지 체크한다. + var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault(); + if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return; - //오늘자 자동생성된 데이터가 있다면 처리하지 않는다 - if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue; + //토,일은 처리하지 않음 + if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return; - //이데이터를 그대로 생성해준다. - var newdr = new JobReport(); - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.wuid = dr.uid;// FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - newdr.pdate = nd; - newdr.import = false; - newdr.hrs = dr.hrs; - newdr.type = dr.type;//210305 누락분 추가 - newdr.ot = dr.ot; - newdr.process = dr.process; - newdr.projectName = dr.projectName; - newdr.pidx = dr.pidx; - newdr.package = dr.package; - newdr.autoinput = true; - newdr.description = dr.description; - newdr.description2 = dr.description2; - newdr.remark = dr.remark; - newdr.requestpart = dr.requestpart; - newdr.status = dr.status; - newdr.tag = dr.tag; - newdr.uid = dr.uid; - dbi.JobReport.Add(newdr); - dbi.SaveChanges(); - } - dbi.Dispose(); - db.Dispose(); - } + var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + foreach (var dr in rows) + { + //퇴사자 확인 + var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault(); + if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue; - /// - /// 로그인으로 업무일지를 작성하는 경우 - /// - void MakeAutoJobReportbyLogin() - { - //자동로그인 업무일지 기록 기능 추가 = 210220 - //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L' - var db = new EEEntitiesMain(); - var nd = DateTime.Now.ToShortDateString(); - if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && - t.autoinput == true && - t.uid == FCOMMON.info.Login.no && - t.pdate == nd).Any() == false) - { - var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); - foreach (var dr in rows) - { - //이데이터를 그대로 생성해준다. - var newdr = new JobReport(); - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.wuid = FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - newdr.pdate = nd; - newdr.import = false; - newdr.hrs = dr.hrs; - newdr.type = dr.type;//210305 누락분 추가 - newdr.ot = dr.ot; - newdr.process = dr.process; - newdr.projectName = dr.projectName; - newdr.pidx = dr.pidx; - newdr.package = dr.package; - newdr.autoinput = true; - newdr.description = dr.description; - newdr.description2 = dr.description2; - newdr.remark = dr.remark; - newdr.requestpart = dr.requestpart; - newdr.status = dr.status; - newdr.tag = dr.tag; - newdr.uid = dr.uid; - db.JobReport.Add(newdr); - } - if (rows.Count() > 0) - { - db.SaveChanges(); - Util.MsgI($"{rows.Count()} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" + - "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); - } - } - } - void AddLoginInfo() - { - string ip = string.Empty; - string hostname = Dns.GetHostName(); - string fullname = System.Net.Dns.GetHostEntry("").HostName; - var nif = NetworkInterface.GetAllNetworkInterfaces(); - var host = Dns.GetHostEntry(hostname); - foreach (IPAddress r in host.AddressList) - { - string str = r.ToString(); - if (str != "" && str.Substring(0, 3) == "10.") - { - ip = str; - break; - } - } + //오늘자 자동생성된 데이터가 있다면 처리하지 않는다 + if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue; - if (ip == "" || hostname == "") return; + //이데이터를 그대로 생성해준다. + var newdr = new JobReport(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = dr.uid;// FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + newdr.hrs = dr.hrs; + newdr.type = dr.type;//210305 누락분 추가 + newdr.ot = dr.ot; + newdr.process = dr.process; + newdr.projectName = dr.projectName; + newdr.pidx = dr.pidx; + newdr.package = dr.package; + newdr.autoinput = true; + newdr.description = dr.description; + newdr.description2 = dr.description2; + newdr.remark = dr.remark; + newdr.requestpart = dr.requestpart; + newdr.status = dr.status; + newdr.tag = dr.tag; + newdr.uid = dr.uid; + dbi.JobReport.Add(newdr); + dbi.SaveChanges(); + } + dbi.Dispose(); + db.Dispose(); - try - { - var db = new EEEntitiesMain(); - db.EETGW_LoginInfo.Add(new EETGW_LoginInfo - { - uid = FCOMMON.info.Login.no, - hostname = fullname, - ip = ip, - login = DateTime.Now, - wuid = FCOMMON.info.Login.no, - wdate = DateTime.Now - }); - db.SaveChanges(); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - Console.WriteLine(ex.Message); - } - } - private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); - } - } + } + + /// + /// 로그인으로 업무일지를 작성하는 경우 + /// + void MakeAutoJobReportbyLogin() + { + //자동로그인 업무일지 기록 기능 추가 = 210220 + //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L' + var db = new EEEntitiesMain(); + var nd = DateTime.Now.ToShortDateString(); + if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && + t.autoinput == true && + t.uid == FCOMMON.info.Login.no && + t.pdate == nd).Any() == false) + { + var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + foreach (var dr in rows) + { + //이데이터를 그대로 생성해준다. + var newdr = new JobReport(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + newdr.hrs = dr.hrs; + newdr.type = dr.type;//210305 누락분 추가 + newdr.ot = dr.ot; + newdr.process = dr.process; + newdr.projectName = dr.projectName; + newdr.pidx = dr.pidx; + newdr.package = dr.package; + newdr.autoinput = true; + newdr.description = dr.description; + newdr.description2 = dr.description2; + newdr.remark = dr.remark; + newdr.requestpart = dr.requestpart; + newdr.status = dr.status; + newdr.tag = dr.tag; + newdr.uid = dr.uid; + db.JobReport.Add(newdr); + } + if (rows.Count() > 0) + { + db.SaveChanges(); + Util.MsgI($"{rows.Count()} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" + + "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); + } + } + } + + void AddLoginInfo() + { + string ip = string.Empty; + string hostname = Dns.GetHostName(); + string fullname = System.Net.Dns.GetHostEntry("").HostName; + + var nif = NetworkInterface.GetAllNetworkInterfaces(); + var host = Dns.GetHostEntry(hostname); + foreach (IPAddress r in host.AddressList) + { + string str = r.ToString(); + + if (str != "" && str.Substring(0, 3) == "10.") + { + ip = str; + break; + } + } + + if (ip == "" || hostname == "") return; + + try + { + var db = new EEEntitiesMain(); + db.EETGW_LoginInfo.Add(new EETGW_LoginInfo + { + uid = FCOMMON.info.Login.no, + hostname = fullname, + ip = ip, + login = DateTime.Now, + wuid = FCOMMON.info.Login.no, + wdate = DateTime.Now + }); + db.SaveChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + Console.WriteLine(ex.Message); + } + } + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); + } + } } diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 45e5a0e..41d5762 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.03.07.0000")] -[assembly: AssemblyFileVersion("22.03.07.0000")] +[assembly: AssemblyVersion("22.04.20.1420")] +[assembly: AssemblyFileVersion("22.04.20.1420")] diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 3c3b4ed..bae509a 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -4164,6 +4164,8 @@ namespace Project { private global::System.Data.DataColumn columnuseUserState; + private global::System.Data.DataColumn columnpassword; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public vGroupUserDataTable() { @@ -4365,6 +4367,14 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn passwordColumn { + get { + return this.columnpassword; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4423,7 +4433,8 @@ namespace Project { string id, string state, bool useJobReport, - bool useUserState) { + bool useUserState, + string password) { vGroupUserRow rowvGroupUserRow = ((vGroupUserRow)(this.NewRow())); object[] columnValuesArray = new object[] { gcode, @@ -4446,7 +4457,8 @@ namespace Project { id, state, useJobReport, - useUserState}; + useUserState, + password}; rowvGroupUserRow.ItemArray = columnValuesArray; this.Rows.Add(rowvGroupUserRow); return rowvGroupUserRow; @@ -4498,6 +4510,7 @@ namespace Project { this.columnstate = base.Columns["state"]; this.columnuseJobReport = base.Columns["useJobReport"]; this.columnuseUserState = base.Columns["useUserState"]; + this.columnpassword = base.Columns["password"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4545,6 +4558,8 @@ namespace Project { base.Columns.Add(this.columnuseJobReport); this.columnuseUserState = new global::System.Data.DataColumn("useUserState", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuseUserState); + this.columnpassword = new global::System.Data.DataColumn("password", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpassword); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columngcode, this.columnid}, true)); @@ -4569,6 +4584,7 @@ namespace Project { this.columnid.AllowDBNull = false; this.columnid.MaxLength = 20; this.columnstate.MaxLength = 20; + this.columnpassword.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8199,6 +8215,22 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string password { + get { + if (this.IspasswordNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablevGroupUser.passwordColumn])); + } + } + set { + this[this.tablevGroupUser.passwordColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsdeptNull() { @@ -8426,6 +8458,18 @@ namespace Project { public void SetuseUserStateNull() { this[this.tablevGroupUser.useUserStateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IspasswordNull() { + return this.IsNull(this.tablevGroupUser.passwordColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetpasswordNull() { + this[this.tablevGroupUser.passwordColumn] = global::System.Convert.DBNull; + } } /// @@ -15510,6 +15554,7 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR tableMapping.ColumnMappings.Add("state", "state"); tableMapping.ColumnMappings.Add("useJobReport", "useJobReport"); tableMapping.ColumnMappings.Add("useUserState", "useUserState"); + tableMapping.ColumnMappings.Add("password", "password"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -15536,16 +15581,22 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState + this._commandCollection[0].CommandText = @"SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password FROM vGroupUser WHERE (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs) ORDER BY name"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].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, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@processs", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1].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, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15596,6 +15647,54 @@ ORDER BY name"; return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByID(dsMSSQL.vGroupUserDataTable dataTable, string gcode, string id) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((id == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(id)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.vGroupUserDataTable GetByID(string gcode, string id) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((id == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(id)); + } + dsMSSQL.vGroupUserDataTable dataTable = new dsMSSQL.vGroupUserDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -16732,7 +16831,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.IDbCommand[2]; + this._commandCollection = new global::System.Data.IDbCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::Project.Properties.Settings.Default.gwcs); ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "SELECT ISNULL(name, \'\') AS itemName\r\nFROM Items\r\nWHERE (idx = @id)"; @@ -16743,6 +16842,13 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "SELECT ISNULL(name, \'\') AS ProjectName\r\nFROM Projects\r\nWHERE (idx = @idx)"; ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.Text; ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).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.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::Project.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "dbo.GetUserLoginCheck"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.ReturnValue, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pw", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16802,6 +16908,46 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, return ((string)(returnValue)); } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual object GetUserLoginCheck(string id, string pw) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2])); + if ((id == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(id)); + } + if ((pw == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(pw)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return null; + } + else { + return ((object)(returnValue)); + } + } } /// diff --git a/Project/dsMSSQL.cs b/Project/dsMSSQL.cs index eae2ed9..ec12345 100644 --- a/Project/dsMSSQL.cs +++ b/Project/dsMSSQL.cs @@ -2,7 +2,7 @@ { - partial class dsMSSQL - { - } + partial class dsMSSQL + { + } } diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index e0e5f3f..441822e 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -1066,7 +1066,7 @@ and uid = @uid - SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState + SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password FROM vGroupUser WHERE (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs) ORDER BY name @@ -1113,8 +1113,21 @@ WHERE (gcode = @gcode) AND (uid = @id) + - + + + + + SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name + + + + + + + + @@ -1316,6 +1329,18 @@ WHERE (idx = @idx) + + + + dbo.GetUserLoginCheck + + + + + + + + @@ -1323,7 +1348,7 @@ WHERE (idx = @idx) - + @@ -1464,7 +1489,7 @@ WHERE (idx = @idx) - + @@ -1535,7 +1560,7 @@ WHERE (idx = @idx) - + @@ -1593,7 +1618,7 @@ WHERE (idx = @idx) - + @@ -1663,7 +1688,7 @@ WHERE (idx = @idx) - + @@ -1721,7 +1746,7 @@ WHERE (idx = @idx) - + @@ -1750,7 +1775,7 @@ WHERE (idx = @idx) - + @@ -1866,7 +1891,7 @@ WHERE (idx = @idx) - + @@ -1905,7 +1930,7 @@ WHERE (idx = @idx) - + @@ -2037,10 +2062,17 @@ WHERE (idx = @idx) + + + + + + + - + diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 2155115..e8aec6d 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -4,19 +4,19 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - - - + + + + + \ No newline at end of file diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index dfda387..73d10b6 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -28,180 +28,181 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMain)); - this.tmDisplay = new System.Windows.Forms.Timer(this.components); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.bw = new System.ComponentModel.BackgroundWorker(); - this.cmTab = new System.Windows.Forms.ContextMenuStrip(this.components); - this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sbBWRun = new System.Windows.Forms.ToolStripStatusLabel(); - this.sbBCD = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.lbSvr = new System.Windows.Forms.ToolStripStatusLabel(); - this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); - this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem(); - this.메일양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_project = new System.Windows.Forms.ToolStripMenuItem(); - this.목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.구매진행현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.layoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem(); - this.목록ToolStripMenuItem1 = 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(); - this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.라이선스ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - 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.toolStripMenuItem9 = 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.toolStripMenuItem10 = 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.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mn_docu = new System.Windows.Forms.ToolStripMenuItem(); - this.메모장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.requestITemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.freeBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.todoListToolStripMenuItem = 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(); - this.btDev = new System.Windows.Forms.ToolStripMenuItem(); - this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.purchaseOrderImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.projectImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.projectImportCompleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.workReportImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addSIdDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.계정목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - 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(); - this.설명서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.cmTab.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // tmDisplay - // - this.tmDisplay.Interval = 300; - this.tmDisplay.Tick += new System.EventHandler(this.tmDisplay_Tick); - // - // bw - // - this.bw.WorkerReportsProgress = true; - this.bw.WorkerSupportsCancellation = true; - this.bw.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bw_DoWork); - // - // cmTab - // - this.cmTab.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMain)); + this.tmDisplay = new System.Windows.Forms.Timer(this.components); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.bw = new System.ComponentModel.BackgroundWorker(); + this.cmTab = new System.Windows.Forms.ContextMenuStrip(this.components); + this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sbBWRun = new System.Windows.Forms.ToolStripStatusLabel(); + this.sbBCD = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.lbSvr = new System.Windows.Forms.ToolStripStatusLabel(); + this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); + this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem(); + this.메일양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem(); + this.mn_project = new System.Windows.Forms.ToolStripMenuItem(); + this.목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.구매진행현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.layoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem(); + this.목록ToolStripMenuItem1 = 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(); + this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.라이선스ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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.toolStripMenuItem9 = 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.toolStripMenuItem10 = 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.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mn_docu = new System.Windows.Forms.ToolStripMenuItem(); + this.메모장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.requestITemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.freeBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.todoListToolStripMenuItem = 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(); + this.btDev = new System.Windows.Forms.ToolStripMenuItem(); + this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.purchaseOrderImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projectImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projectImportCompleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.workReportImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addSIdDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.계정목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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(); + this.설명서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.버젼확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.cmTab.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // tmDisplay + // + this.tmDisplay.Interval = 300; + this.tmDisplay.Tick += new System.EventHandler(this.tmDisplay_Tick); + // + // bw + // + this.bw.WorkerReportsProgress = true; + this.bw.WorkerSupportsCancellation = true; + this.bw.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bw_DoWork); + // + // cmTab + // + this.cmTab.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveImageToolStripMenuItem}); - this.cmTab.Name = "cmVision"; - this.cmTab.Size = new System.Drawing.Size(99, 26); - // - // saveImageToolStripMenuItem - // - this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem"; - this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(98, 22); - this.saveImageToolStripMenuItem.Text = "닫기"; - // - // sbBWRun - // - this.sbBWRun.Name = "sbBWRun"; - this.sbBWRun.Size = new System.Drawing.Size(19, 17); - this.sbBWRun.Text = "●"; - // - // sbBCD - // - this.sbBCD.Name = "sbBCD"; - this.sbBCD.Size = new System.Drawing.Size(35, 17); - this.sbBCD.Text = " BCD"; - // - // statusStrip1 - // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cmTab.Name = "cmVision"; + this.cmTab.Size = new System.Drawing.Size(99, 26); + // + // saveImageToolStripMenuItem + // + this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem"; + this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(98, 22); + this.saveImageToolStripMenuItem.Text = "닫기"; + // + // sbBWRun + // + this.sbBWRun.Name = "sbBWRun"; + this.sbBWRun.Size = new System.Drawing.Size(19, 17); + this.sbBWRun.Text = "●"; + // + // sbBCD + // + this.sbBCD.Name = "sbBCD"; + this.sbBCD.Size = new System.Drawing.Size(35, 17); + this.sbBCD.Text = " BCD"; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.sbBWRun, this.lbSvr, this.sbBCD, this.sbLogin}); - this.statusStrip1.Location = new System.Drawing.Point(1, 622); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1094, 22); - this.statusStrip1.TabIndex = 30; - this.statusStrip1.Text = "statusStrip1"; - // - // lbSvr - // - this.lbSvr.Name = "lbSvr"; - this.lbSvr.Size = new System.Drawing.Size(19, 17); - this.lbSvr.Text = "●"; - // - // sbLogin - // - this.sbLogin.Name = "sbLogin"; - this.sbLogin.Size = new System.Drawing.Size(50, 17); - this.sbLogin.Text = "{LOGIN}"; - // - // menuStrip1 - // - this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusStrip1.Location = new System.Drawing.Point(1, 622); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(1094, 22); + this.statusStrip1.TabIndex = 30; + this.statusStrip1.Text = "statusStrip1"; + // + // lbSvr + // + this.lbSvr.Name = "lbSvr"; + this.lbSvr.Size = new System.Drawing.Size(19, 17); + this.lbSvr.Text = "●"; + // + // sbLogin + // + this.sbLogin.Name = "sbLogin"; + this.sbLogin.Size = new System.Drawing.Size(50, 17); + this.sbLogin.Text = "{LOGIN}"; + // + // menuStrip1 + // + this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btSetting, this.로그인ToolStripMenuItem, this.commonToolStripMenuItem, @@ -210,115 +211,116 @@ this.기타ToolStripMenuItem, this.즐겨찾기ToolStripMenuItem, this.btDev, - this.설명서ToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(1, 1); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1094, 27); - this.menuStrip1.TabIndex = 29; - this.menuStrip1.Text = "menuStrip1"; - // - // btSetting - // - this.btSetting.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btSetting.Image = ((System.Drawing.Image)(resources.GetObject("btSetting.Image"))); - this.btSetting.Name = "btSetting"; - this.btSetting.Size = new System.Drawing.Size(65, 23); - this.btSetting.Text = "설정"; - this.btSetting.Click += new System.EventHandler(this.settingToolStripMenuItem_Click); - // - // 로그인ToolStripMenuItem - // - this.로그인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("로그인ToolStripMenuItem.Image"))); - this.로그인ToolStripMenuItem.Name = "로그인ToolStripMenuItem"; - this.로그인ToolStripMenuItem.Size = new System.Drawing.Size(79, 23); - this.로그인ToolStripMenuItem.Text = "로그인"; - this.로그인ToolStripMenuItem.Click += new System.EventHandler(this.로그인ToolStripMenuItem_Click); - // - // commonToolStripMenuItem - // - this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.설명서ToolStripMenuItem, + this.버젼확인ToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(1, 1); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(1094, 27); + this.menuStrip1.TabIndex = 29; + this.menuStrip1.Text = "menuStrip1"; + // + // btSetting + // + this.btSetting.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btSetting.Image = ((System.Drawing.Image)(resources.GetObject("btSetting.Image"))); + this.btSetting.Name = "btSetting"; + this.btSetting.Size = new System.Drawing.Size(65, 23); + this.btSetting.Text = "설정"; + this.btSetting.Click += new System.EventHandler(this.settingToolStripMenuItem_Click); + // + // 로그인ToolStripMenuItem + // + this.로그인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("로그인ToolStripMenuItem.Image"))); + this.로그인ToolStripMenuItem.Name = "로그인ToolStripMenuItem"; + this.로그인ToolStripMenuItem.Size = new System.Drawing.Size(79, 23); + this.로그인ToolStripMenuItem.Text = "로그인"; + this.로그인ToolStripMenuItem.Click += new System.EventHandler(this.로그인ToolStripMenuItem_Click); + // + // commonToolStripMenuItem + // + this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.codesToolStripMenuItem, this.itemsToolStripMenuItem, this.userInfoToolStripMenuItem, this.customerToolStripMenuItem, this.mn_kuntae, this.메일양식ToolStripMenuItem}); - this.commonToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("commonToolStripMenuItem.Image"))); - this.commonToolStripMenuItem.Name = "commonToolStripMenuItem"; - this.commonToolStripMenuItem.Size = new System.Drawing.Size(93, 23); - this.commonToolStripMenuItem.Text = "공용정보"; - // - // codesToolStripMenuItem - // - this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); - this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.codesToolStripMenuItem.Text = "공용코드"; - this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); - // - // itemsToolStripMenuItem - // - this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.itemsToolStripMenuItem.Text = "품목정보"; - this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); - // - // userInfoToolStripMenuItem - // - this.userInfoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.commonToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("commonToolStripMenuItem.Image"))); + this.commonToolStripMenuItem.Name = "commonToolStripMenuItem"; + this.commonToolStripMenuItem.Size = new System.Drawing.Size(93, 23); + this.commonToolStripMenuItem.Text = "공용정보"; + // + // codesToolStripMenuItem + // + this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); + this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; + this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.codesToolStripMenuItem.Text = "공용코드"; + this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); + // + // itemsToolStripMenuItem + // + this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.itemsToolStripMenuItem.Text = "품목정보"; + this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); + // + // userInfoToolStripMenuItem + // + this.userInfoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userAccountToolStripMenuItem, this.myAccouserToolStripMenuItem, this.권한설정ToolStripMenuItem}); - this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.userInfoToolStripMenuItem.Text = "사용자"; - // - // userAccountToolStripMenuItem - // - this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem"; - this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24); - this.userAccountToolStripMenuItem.Text = "계정정보"; - this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click); - // - // myAccouserToolStripMenuItem - // - this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem"; - this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24); - this.myAccouserToolStripMenuItem.Text = "계정목록"; - this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); - // - // 권한설정ToolStripMenuItem - // - this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); - this.권한설정ToolStripMenuItem.Text = "권한설정"; - this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); - // - // customerToolStripMenuItem - // - this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.customerToolStripMenuItem.Text = "업체정보"; - this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); - // - // mn_kuntae - // - this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(153, 24); - this.mn_kuntae.Text = "월별 근무표"; - this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); - // - // 메일양식ToolStripMenuItem - // - this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); - this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.메일양식ToolStripMenuItem.Text = "메일 양식"; - this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); - // - // managementToolStripMenuItem - // - this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.userInfoToolStripMenuItem.Text = "사용자"; + // + // userAccountToolStripMenuItem + // + this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem"; + this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.userAccountToolStripMenuItem.Text = "계정정보"; + this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click); + // + // myAccouserToolStripMenuItem + // + this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem"; + this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.myAccouserToolStripMenuItem.Text = "계정목록"; + this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); + // + // 권한설정ToolStripMenuItem + // + this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.권한설정ToolStripMenuItem.Text = "권한설정"; + this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); + // + // customerToolStripMenuItem + // + this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; + this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.customerToolStripMenuItem.Text = "업체정보"; + this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); + // + // mn_kuntae + // + this.mn_kuntae.Name = "mn_kuntae"; + this.mn_kuntae.Size = new System.Drawing.Size(153, 24); + this.mn_kuntae.Text = "월별 근무표"; + this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); + // + // 메일양식ToolStripMenuItem + // + this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); + this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.메일양식ToolStripMenuItem.Text = "메일 양식"; + this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); + // + // managementToolStripMenuItem + // + this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mn_purchase, this.mn_project, this.mn_dailyhistory, @@ -330,183 +332,183 @@ this.mn_eq, this.휴가관리ToolStripMenuItem, this.personalInventoryToolStripMenuItem}); - this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image"))); - this.managementToolStripMenuItem.Name = "managementToolStripMenuItem"; - this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23); - this.managementToolStripMenuItem.Text = "관리"; - // - // mn_purchase - // - this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); - this.mn_purchase.Name = "mn_purchase"; - this.mn_purchase.Size = new System.Drawing.Size(203, 24); - this.mn_purchase.Text = "구매신청"; - this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); - // - // mn_project - // - this.mn_project.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image"))); + this.managementToolStripMenuItem.Name = "managementToolStripMenuItem"; + this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23); + this.managementToolStripMenuItem.Text = "관리"; + // + // mn_purchase + // + this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); + this.mn_purchase.Name = "mn_purchase"; + this.mn_purchase.Size = new System.Drawing.Size(203, 24); + this.mn_purchase.Text = "구매신청"; + this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); + // + // mn_project + // + this.mn_project.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.목록ToolStripMenuItem, this.구매진행현황ToolStripMenuItem, this.layoutToolStripMenuItem}); - this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image"))); - this.mn_project.Name = "mn_project"; - this.mn_project.Size = new System.Drawing.Size(203, 24); - this.mn_project.Text = "프로젝트"; - this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click); - // - // 목록ToolStripMenuItem - // - this.목록ToolStripMenuItem.Name = "목록ToolStripMenuItem"; - this.목록ToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 24); - this.구매진행현황ToolStripMenuItem.Text = "CR구매현황"; - this.구매진행현황ToolStripMenuItem.Click += new System.EventHandler(this.구매진행현황ToolStripMenuItem_Click); - // - // layoutToolStripMenuItem - // - this.layoutToolStripMenuItem.Name = "layoutToolStripMenuItem"; - this.layoutToolStripMenuItem.Size = new System.Drawing.Size(152, 24); - this.layoutToolStripMenuItem.Text = "Layout"; - this.layoutToolStripMenuItem.Click += new System.EventHandler(this.layoutToolStripMenuItem_Click); - // - // mn_dailyhistory - // - this.mn_dailyhistory.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image"))); + this.mn_project.Name = "mn_project"; + this.mn_project.Size = new System.Drawing.Size(203, 24); + this.mn_project.Text = "프로젝트"; + this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click); + // + // 목록ToolStripMenuItem + // + this.목록ToolStripMenuItem.Name = "목록ToolStripMenuItem"; + this.목록ToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 24); + this.구매진행현황ToolStripMenuItem.Text = "CR구매현황"; + this.구매진행현황ToolStripMenuItem.Click += new System.EventHandler(this.구매진행현황ToolStripMenuItem_Click); + // + // layoutToolStripMenuItem + // + this.layoutToolStripMenuItem.Name = "layoutToolStripMenuItem"; + this.layoutToolStripMenuItem.Size = new System.Drawing.Size(152, 24); + this.layoutToolStripMenuItem.Text = "Layout"; + this.layoutToolStripMenuItem.Click += new System.EventHandler(this.layoutToolStripMenuItem_Click); + // + // mn_dailyhistory + // + this.mn_dailyhistory.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.목록ToolStripMenuItem1, this.자동입력ToolStripMenuItem, this.양식ToolStripMenuItem}); - this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image"))); - this.mn_dailyhistory.Name = "mn_dailyhistory"; - this.mn_dailyhistory.Size = new System.Drawing.Size(203, 24); - this.mn_dailyhistory.Text = "업무일지"; - this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click); - // - // 목록ToolStripMenuItem1 - // - this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 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(134, 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(134, 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(203, 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(203, 24); - this.교육목록ToolStripMenuItem.Text = "교육목록"; - this.교육목록ToolStripMenuItem.Click += new System.EventHandler(this.교육목록ToolStripMenuItem_Click); - // - // 비용절감ToolStripMenuItem - // - this.비용절감ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; - this.비용절감ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("비용절감ToolStripMenuItem.Image"))); - 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 - // - this.라이선스ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("라이선스ToolStripMenuItem.Image"))); - 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); - // - // mn_jago - // - this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image"))); + this.mn_dailyhistory.Name = "mn_dailyhistory"; + this.mn_dailyhistory.Size = new System.Drawing.Size(203, 24); + this.mn_dailyhistory.Text = "업무일지"; + this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click); + // + // 목록ToolStripMenuItem1 + // + this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 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(134, 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(134, 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(203, 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(203, 24); + this.교육목록ToolStripMenuItem.Text = "교육목록"; + this.교육목록ToolStripMenuItem.Click += new System.EventHandler(this.교육목록ToolStripMenuItem_Click); + // + // 비용절감ToolStripMenuItem + // + this.비용절감ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; + this.비용절감ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("비용절감ToolStripMenuItem.Image"))); + 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 + // + this.라이선스ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("라이선스ToolStripMenuItem.Image"))); + 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); + // + // mn_jago + // + this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.관리ToolStripMenuItem, this.재고현황ToolStripMenuItem, this.pMP현황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); - this.mn_jago.Text = "품목재고"; - // - // 관리ToolStripMenuItem - // - this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem"; - this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 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(140, 24); - 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.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); + this.mn_jago.Text = "품목재고"; + // + // 관리ToolStripMenuItem + // + this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem"; + this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 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(140, 24); + 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.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.Name = "aLLToolStripMenuItem"; - this.aLLToolStripMenuItem.Size = new System.Drawing.Size(186, 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(183, 6); - // - // 라인코드관리ToolStripMenuItem - // - this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem"; - this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(186, 24); - this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; - this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); - // - // 휴가관리ToolStripMenuItem - // - this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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.Name = "aLLToolStripMenuItem"; + this.aLLToolStripMenuItem.Size = new System.Drawing.Size(186, 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(183, 6); + // + // 라인코드관리ToolStripMenuItem + // + this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem"; + this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(186, 24); + this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; + this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); + // + // 휴가관리ToolStripMenuItem + // + this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.휴일연장근무승인ToolStripMenuItem, this.휴일연장근무집계표출력ToolStripMenuItem, this.toolStripMenuItem9, @@ -518,102 +520,102 @@ this.출근부출력ToolStripMenuItem, this.휴가사용현황ToolStripMenuItem, this.근로명부ToolStripMenuItem}); - this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; - this.휴가관리ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("휴가관리ToolStripMenuItem.Image"))); - 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 - // - this.휴일연장근무승인ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem"; - this.휴일연장근무승인ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 24); - this.휴일연장근무집계표출력ToolStripMenuItem.Text = "휴일/연장근무 집계표 출력"; - this.휴일연장근무집계표출력ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무집계표출력ToolStripMenuItem_Click); - // - // toolStripMenuItem9 - // - this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(245, 6); - // - // 근태입력ToolStripMenuItem - // - this.근태입력ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; - this.근태입력ToolStripMenuItem.Name = "근태입력ToolStripMenuItem"; - this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 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(248, 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(248, 24); - this.근태입력오류확인ToolStripMenuItem.Text = "근태 입력 오류 확인"; - this.근태입력오류확인ToolStripMenuItem.Click += new System.EventHandler(this.근태입력오류확인ToolStripMenuItem_Click); - // - // toolStripMenuItem10 - // - this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(245, 6); - // - // 출근부출력ToolStripMenuItem - // - this.출근부출력ToolStripMenuItem.Name = "출근부출력ToolStripMenuItem"; - this.출근부출력ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 24); - this.휴가사용현황ToolStripMenuItem.Text = "휴가이력 현황"; - this.휴가사용현황ToolStripMenuItem.Click += new System.EventHandler(this.휴가사용현황ToolStripMenuItem_Click); - // - // 근로명부ToolStripMenuItem - // - this.근로명부ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; - this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem"; - this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(248, 24); - this.근로명부ToolStripMenuItem.Text = "근로자명부"; - this.근로명부ToolStripMenuItem.Visible = false; - this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click); - // - // personalInventoryToolStripMenuItem - // - this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; - this.personalInventoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("personalInventoryToolStripMenuItem.Image"))); - this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; - this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(203, 24); - this.personalInventoryToolStripMenuItem.Text = "개인별 물품(테스트)"; - this.personalInventoryToolStripMenuItem.Visible = false; - this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); - // - // mn_docu - // - this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; + this.휴가관리ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("휴가관리ToolStripMenuItem.Image"))); + 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 + // + this.휴일연장근무승인ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem"; + this.휴일연장근무승인ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 24); + this.휴일연장근무집계표출력ToolStripMenuItem.Text = "휴일/연장근무 집계표 출력"; + this.휴일연장근무집계표출력ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무집계표출력ToolStripMenuItem_Click); + // + // toolStripMenuItem9 + // + this.toolStripMenuItem9.Name = "toolStripMenuItem9"; + this.toolStripMenuItem9.Size = new System.Drawing.Size(245, 6); + // + // 근태입력ToolStripMenuItem + // + this.근태입력ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; + this.근태입력ToolStripMenuItem.Name = "근태입력ToolStripMenuItem"; + this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 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(248, 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(248, 24); + this.근태입력오류확인ToolStripMenuItem.Text = "근태 입력 오류 확인"; + this.근태입력오류확인ToolStripMenuItem.Click += new System.EventHandler(this.근태입력오류확인ToolStripMenuItem_Click); + // + // toolStripMenuItem10 + // + this.toolStripMenuItem10.Name = "toolStripMenuItem10"; + this.toolStripMenuItem10.Size = new System.Drawing.Size(245, 6); + // + // 출근부출력ToolStripMenuItem + // + this.출근부출력ToolStripMenuItem.Name = "출근부출력ToolStripMenuItem"; + this.출근부출력ToolStripMenuItem.Size = new System.Drawing.Size(248, 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(248, 24); + this.휴가사용현황ToolStripMenuItem.Text = "휴가이력 현황"; + this.휴가사용현황ToolStripMenuItem.Click += new System.EventHandler(this.휴가사용현황ToolStripMenuItem_Click); + // + // 근로명부ToolStripMenuItem + // + this.근로명부ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; + this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem"; + this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(248, 24); + this.근로명부ToolStripMenuItem.Text = "근로자명부"; + this.근로명부ToolStripMenuItem.Visible = false; + this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click); + // + // personalInventoryToolStripMenuItem + // + this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; + this.personalInventoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("personalInventoryToolStripMenuItem.Image"))); + this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; + this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(203, 24); + this.personalInventoryToolStripMenuItem.Text = "개인별 물품(테스트)"; + this.personalInventoryToolStripMenuItem.Visible = false; + this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); + // + // mn_docu + // + this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.메모장ToolStripMenuItem, this.toolStripMenuItem4, this.패치내역ToolStripMenuItem1, @@ -625,120 +627,120 @@ this.bugReportToolStripMenuItem, this.todoListToolStripMenuItem, this.메일전송ToolStripMenuItem}); - this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image"))); - this.mn_docu.Name = "mn_docu"; - this.mn_docu.Size = new System.Drawing.Size(65, 23); - this.mn_docu.Text = "문서"; - // - // 메모장ToolStripMenuItem - // - this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 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); - // - // 패치내역ToolStripMenuItem1 - // - this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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.Text = "메일 내역"; - this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6); - // - // minutesToolStripMenuItem - // - this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; - this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.minutesToolStripMenuItem.Text = "회의록"; - this.minutesToolStripMenuItem.Visible = false; - this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); - // - // requestITemToolStripMenuItem - // - this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; - this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.requestITemToolStripMenuItem.Text = "견적요청"; - this.requestITemToolStripMenuItem.Visible = false; - this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); - // - // freeBoardToolStripMenuItem - // - this.freeBoardToolStripMenuItem.Enabled = false; - this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.freeBoardToolStripMenuItem.Text = "Free Board"; - this.freeBoardToolStripMenuItem.Visible = false; - // - // bugReportToolStripMenuItem - // - this.bugReportToolStripMenuItem.Enabled = false; - this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.bugReportToolStripMenuItem.Text = "Bug Report"; - this.bugReportToolStripMenuItem.Visible = false; - // - // todoListToolStripMenuItem - // - this.todoListToolStripMenuItem.Enabled = false; - this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.todoListToolStripMenuItem.Text = "Todo List"; - this.todoListToolStripMenuItem.Visible = false; - this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); - // - // 메일전송ToolStripMenuItem - // - this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; - this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); - this.메일전송ToolStripMenuItem.Text = "메일전송"; - this.메일전송ToolStripMenuItem.Visible = false; - this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); - // - // 기타ToolStripMenuItem - // - this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image"))); + this.mn_docu.Name = "mn_docu"; + this.mn_docu.Size = new System.Drawing.Size(65, 23); + this.mn_docu.Text = "문서"; + // + // 메모장ToolStripMenuItem + // + this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 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); + // + // 패치내역ToolStripMenuItem1 + // + this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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.Text = "메일 내역"; + this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6); + // + // minutesToolStripMenuItem + // + this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; + this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.minutesToolStripMenuItem.Text = "회의록"; + this.minutesToolStripMenuItem.Visible = false; + this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); + // + // requestITemToolStripMenuItem + // + this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; + this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.requestITemToolStripMenuItem.Text = "견적요청"; + this.requestITemToolStripMenuItem.Visible = false; + this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); + // + // freeBoardToolStripMenuItem + // + this.freeBoardToolStripMenuItem.Enabled = false; + this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.freeBoardToolStripMenuItem.Text = "Free Board"; + this.freeBoardToolStripMenuItem.Visible = false; + // + // bugReportToolStripMenuItem + // + this.bugReportToolStripMenuItem.Enabled = false; + this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.bugReportToolStripMenuItem.Text = "Bug Report"; + this.bugReportToolStripMenuItem.Visible = false; + // + // todoListToolStripMenuItem + // + this.todoListToolStripMenuItem.Enabled = false; + this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.todoListToolStripMenuItem.Text = "Todo List"; + this.todoListToolStripMenuItem.Visible = false; + this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); + // + // 메일전송ToolStripMenuItem + // + this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; + this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24); + this.메일전송ToolStripMenuItem.Text = "메일전송"; + this.메일전송ToolStripMenuItem.Visible = false; + this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); + // + // 기타ToolStripMenuItem + // + this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.품목검색ToolStripMenuItem}); - this.기타ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("기타ToolStripMenuItem.Image"))); - this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; - this.기타ToolStripMenuItem.Size = new System.Drawing.Size(65, 23); - this.기타ToolStripMenuItem.Text = "기타"; - // - // 품목검색ToolStripMenuItem - // - this.품목검색ToolStripMenuItem.Name = "품목검색ToolStripMenuItem"; - this.품목검색ToolStripMenuItem.Size = new System.Drawing.Size(139, 24); - this.품목검색ToolStripMenuItem.Text = "품목 검색"; - this.품목검색ToolStripMenuItem.Click += new System.EventHandler(this.품목검색ToolStripMenuItem_Click); - // - // 즐겨찾기ToolStripMenuItem - // - this.즐겨찾기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("즐겨찾기ToolStripMenuItem.Image"))); - this.즐겨찾기ToolStripMenuItem.Name = "즐겨찾기ToolStripMenuItem"; - this.즐겨찾기ToolStripMenuItem.Size = new System.Drawing.Size(93, 23); - this.즐겨찾기ToolStripMenuItem.Text = "즐겨찾기"; - // - // btDev - // - this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.기타ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("기타ToolStripMenuItem.Image"))); + this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem"; + this.기타ToolStripMenuItem.Size = new System.Drawing.Size(65, 23); + this.기타ToolStripMenuItem.Text = "기타"; + // + // 품목검색ToolStripMenuItem + // + this.품목검색ToolStripMenuItem.Name = "품목검색ToolStripMenuItem"; + this.품목검색ToolStripMenuItem.Size = new System.Drawing.Size(139, 24); + this.품목검색ToolStripMenuItem.Text = "품목 검색"; + this.품목검색ToolStripMenuItem.Click += new System.EventHandler(this.품목검색ToolStripMenuItem_Click); + // + // 즐겨찾기ToolStripMenuItem + // + this.즐겨찾기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("즐겨찾기ToolStripMenuItem.Image"))); + this.즐겨찾기ToolStripMenuItem.Name = "즐겨찾기ToolStripMenuItem"; + this.즐겨찾기ToolStripMenuItem.Size = new System.Drawing.Size(93, 23); + this.즐겨찾기ToolStripMenuItem.Text = "즐겨찾기"; + // + // btDev + // + this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.purchaseImportToolStripMenuItem, this.purchaseOrderImportToolStripMenuItem, this.materialImportToolStripMenuItem, @@ -758,265 +760,273 @@ this.메일자동발신테스트ToolStripMenuItem, this.toolStripMenuItem5, this.아이템비활성화하기ToolStripMenuItem}); - this.btDev.ForeColor = System.Drawing.Color.Blue; - this.btDev.Image = ((System.Drawing.Image)(resources.GetObject("btDev.Image"))); - this.btDev.Name = "btDev"; - this.btDev.Size = new System.Drawing.Size(107, 23); - this.btDev.Text = "개발자메뉴"; - this.btDev.Visible = false; - // - // purchaseImportToolStripMenuItem - // - this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem"; - this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.purchaseImportToolStripMenuItem.Text = "Purchase Import"; - this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click); - // - // purchaseOrderImportToolStripMenuItem - // - this.purchaseOrderImportToolStripMenuItem.Name = "purchaseOrderImportToolStripMenuItem"; - this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.purchaseOrderImportToolStripMenuItem.Text = "Purchase(Order) Import"; - this.purchaseOrderImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseOrderImportToolStripMenuItem_Click); - // - // materialImportToolStripMenuItem - // - this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; - this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.materialImportToolStripMenuItem.Text = "Material Import"; - this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); - // - // purchaseDataConvertToolStripMenuItem - // - this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem"; - this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert"; - this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click); - // - // customerImportToolStripMenuItem - // - this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem"; - this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.customerImportToolStripMenuItem.Text = "Customer Import"; - this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click); - // - // projectImportToolStripMenuItem - // - this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem"; - this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.projectImportToolStripMenuItem.Text = "Project Import"; - this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click); - // - // projectImportCompleteToolStripMenuItem - // - this.projectImportCompleteToolStripMenuItem.Name = "projectImportCompleteToolStripMenuItem"; - this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.projectImportCompleteToolStripMenuItem.Text = "Project Import(Complete)"; - this.projectImportCompleteToolStripMenuItem.Click += new System.EventHandler(this.projectImportCompleteToolStripMenuItem_Click); - // - // workReportImportToolStripMenuItem - // - this.workReportImportToolStripMenuItem.Name = "workReportImportToolStripMenuItem"; - this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.workReportImportToolStripMenuItem.Text = "WorkReport Import"; - this.workReportImportToolStripMenuItem.Click += new System.EventHandler(this.workReportImportToolStripMenuItem_Click); - // - // addSIdDataToolStripMenuItem - // - this.addSIdDataToolStripMenuItem.Name = "addSIdDataToolStripMenuItem"; - this.addSIdDataToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.addSIdDataToolStripMenuItem.Text = "Make Sid Data"; - this.addSIdDataToolStripMenuItem.Click += new System.EventHandler(this.addSIdDataToolStripMenuItem_Click); - // - // 계정목록ToolStripMenuItem - // - this.계정목록ToolStripMenuItem.Name = "계정목록ToolStripMenuItem"; - this.계정목록ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.계정목록ToolStripMenuItem.Text = "계정목록(AD)"; - this.계정목록ToolStripMenuItem.Click += new System.EventHandler(this.계정목록ToolStripMenuItem_Click); - // - // 그룹정보ToolStripMenuItem1 - // - this.그룹정보ToolStripMenuItem1.Name = "그룹정보ToolStripMenuItem1"; - this.그룹정보ToolStripMenuItem1.Size = new System.Drawing.Size(278, 24); - this.그룹정보ToolStripMenuItem1.Text = "그룹정보"; - this.그룹정보ToolStripMenuItem1.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem1_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.ForeColor = System.Drawing.Color.HotPink; - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(278, 24); - this.toolStripMenuItem1.Text = "Staff Grid"; - this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); - // - // 임의테이블조작ToolStripMenuItem - // - this.임의테이블조작ToolStripMenuItem.Name = "임의테이블조작ToolStripMenuItem"; - this.임의테이블조작ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - 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(278, 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"; - this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - 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(278, 24); - this.accessDBToolStripMenuItem.Text = "Access DB"; - this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click); - // - // 메일자동발신테스트ToolStripMenuItem - // - this.메일자동발신테스트ToolStripMenuItem.Name = "메일자동발신테스트ToolStripMenuItem"; - this.메일자동발신테스트ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.메일자동발신테스트ToolStripMenuItem.Text = "메일자동발신(테스트)"; - this.메일자동발신테스트ToolStripMenuItem.Click += new System.EventHandler(this.메일자동발신테스트ToolStripMenuItem_Click); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(275, 6); - // - // 아이템비활성화하기ToolStripMenuItem - // - this.아이템비활성화하기ToolStripMenuItem.Name = "아이템비활성화하기ToolStripMenuItem"; - this.아이템비활성화하기ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.아이템비활성화하기ToolStripMenuItem.Text = "아이템 비활성화하기"; - this.아이템비활성화하기ToolStripMenuItem.Click += new System.EventHandler(this.아이템비활성화하기ToolStripMenuItem_Click); - // - // 설명서ToolStripMenuItem - // - this.설명서ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("설명서ToolStripMenuItem.Image"))); - this.설명서ToolStripMenuItem.Name = "설명서ToolStripMenuItem"; - this.설명서ToolStripMenuItem.Size = new System.Drawing.Size(79, 23); - this.설명서ToolStripMenuItem.Text = "설명서"; - this.설명서ToolStripMenuItem.Click += new System.EventHandler(this.설명서ToolStripMenuItem_Click); - // - // tabControl1 - // - this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tabControl1.Location = new System.Drawing.Point(1, 28); - this.tabControl1.Multiline = true; - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1062, 594); - 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 - // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Right; - this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btDev.ForeColor = System.Drawing.Color.Blue; + this.btDev.Image = ((System.Drawing.Image)(resources.GetObject("btDev.Image"))); + this.btDev.Name = "btDev"; + this.btDev.Size = new System.Drawing.Size(107, 23); + this.btDev.Text = "개발자메뉴"; + this.btDev.Visible = false; + // + // purchaseImportToolStripMenuItem + // + this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem"; + this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.purchaseImportToolStripMenuItem.Text = "Purchase Import"; + this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click); + // + // purchaseOrderImportToolStripMenuItem + // + this.purchaseOrderImportToolStripMenuItem.Name = "purchaseOrderImportToolStripMenuItem"; + this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.purchaseOrderImportToolStripMenuItem.Text = "Purchase(Order) Import"; + this.purchaseOrderImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseOrderImportToolStripMenuItem_Click); + // + // materialImportToolStripMenuItem + // + this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; + this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.materialImportToolStripMenuItem.Text = "Material Import"; + this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); + // + // purchaseDataConvertToolStripMenuItem + // + this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem"; + this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert"; + this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click); + // + // customerImportToolStripMenuItem + // + this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem"; + this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.customerImportToolStripMenuItem.Text = "Customer Import"; + this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click); + // + // projectImportToolStripMenuItem + // + this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem"; + this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.projectImportToolStripMenuItem.Text = "Project Import"; + this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click); + // + // projectImportCompleteToolStripMenuItem + // + this.projectImportCompleteToolStripMenuItem.Name = "projectImportCompleteToolStripMenuItem"; + this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.projectImportCompleteToolStripMenuItem.Text = "Project Import(Complete)"; + this.projectImportCompleteToolStripMenuItem.Click += new System.EventHandler(this.projectImportCompleteToolStripMenuItem_Click); + // + // workReportImportToolStripMenuItem + // + this.workReportImportToolStripMenuItem.Name = "workReportImportToolStripMenuItem"; + this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.workReportImportToolStripMenuItem.Text = "WorkReport Import"; + this.workReportImportToolStripMenuItem.Click += new System.EventHandler(this.workReportImportToolStripMenuItem_Click); + // + // addSIdDataToolStripMenuItem + // + this.addSIdDataToolStripMenuItem.Name = "addSIdDataToolStripMenuItem"; + this.addSIdDataToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.addSIdDataToolStripMenuItem.Text = "Make Sid Data"; + this.addSIdDataToolStripMenuItem.Click += new System.EventHandler(this.addSIdDataToolStripMenuItem_Click); + // + // 계정목록ToolStripMenuItem + // + this.계정목록ToolStripMenuItem.Name = "계정목록ToolStripMenuItem"; + this.계정목록ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.계정목록ToolStripMenuItem.Text = "계정목록(AD)"; + this.계정목록ToolStripMenuItem.Click += new System.EventHandler(this.계정목록ToolStripMenuItem_Click); + // + // 그룹정보ToolStripMenuItem1 + // + this.그룹정보ToolStripMenuItem1.Name = "그룹정보ToolStripMenuItem1"; + this.그룹정보ToolStripMenuItem1.Size = new System.Drawing.Size(278, 24); + this.그룹정보ToolStripMenuItem1.Text = "그룹정보"; + this.그룹정보ToolStripMenuItem1.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem1_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.ForeColor = System.Drawing.Color.HotPink; + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(278, 24); + this.toolStripMenuItem1.Text = "Staff Grid"; + this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); + // + // 임의테이블조작ToolStripMenuItem + // + this.임의테이블조작ToolStripMenuItem.Name = "임의테이블조작ToolStripMenuItem"; + this.임의테이블조작ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + 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(278, 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"; + this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + 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(278, 24); + this.accessDBToolStripMenuItem.Text = "Access DB"; + this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click); + // + // 메일자동발신테스트ToolStripMenuItem + // + this.메일자동발신테스트ToolStripMenuItem.Name = "메일자동발신테스트ToolStripMenuItem"; + this.메일자동발신테스트ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.메일자동발신테스트ToolStripMenuItem.Text = "메일자동발신(테스트)"; + this.메일자동발신테스트ToolStripMenuItem.Click += new System.EventHandler(this.메일자동발신테스트ToolStripMenuItem_Click); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(275, 6); + // + // 아이템비활성화하기ToolStripMenuItem + // + this.아이템비활성화하기ToolStripMenuItem.Name = "아이템비활성화하기ToolStripMenuItem"; + this.아이템비활성화하기ToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.아이템비활성화하기ToolStripMenuItem.Text = "아이템 비활성화하기"; + this.아이템비활성화하기ToolStripMenuItem.Click += new System.EventHandler(this.아이템비활성화하기ToolStripMenuItem_Click); + // + // 설명서ToolStripMenuItem + // + this.설명서ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("설명서ToolStripMenuItem.Image"))); + this.설명서ToolStripMenuItem.Name = "설명서ToolStripMenuItem"; + this.설명서ToolStripMenuItem.Size = new System.Drawing.Size(79, 23); + this.설명서ToolStripMenuItem.Text = "설명서"; + this.설명서ToolStripMenuItem.Click += new System.EventHandler(this.설명서ToolStripMenuItem_Click); + // + // 버젼확인ToolStripMenuItem + // + this.버젼확인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("버젼확인ToolStripMenuItem.Image"))); + this.버젼확인ToolStripMenuItem.Name = "버젼확인ToolStripMenuItem"; + this.버젼확인ToolStripMenuItem.Size = new System.Drawing.Size(93, 23); + this.버젼확인ToolStripMenuItem.Text = "버젼확인"; + this.버젼확인ToolStripMenuItem.Click += new System.EventHandler(this.버젼확인ToolStripMenuItem_Click); + // + // tabControl1 + // + this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tabControl1.Location = new System.Drawing.Point(1, 28); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.ShowToolTips = true; + this.tabControl1.Size = new System.Drawing.Size(1065, 594); + 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 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Right; + this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem8, this.toolStripMenuItem7, this.toolStripMenuItem6, this.toolStripButton1, this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(1063, 28); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(32, 594); - this.toolStrip1.TabIndex = 35; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripMenuItem8 - // - this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); - this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); - this.toolStripMenuItem8.Text = "업무일지"; - this.toolStripMenuItem8.ToolTipText = "업무일지"; - this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); - // - // toolStripMenuItem7 - // - this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); - this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); - this.toolStripMenuItem7.Text = "구매신청"; - this.toolStripMenuItem7.ToolTipText = "구매신청"; - this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); - // - // toolStripMenuItem6 - // - this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); - this.toolStripMenuItem6.Text = "프로젝트"; - this.toolStripMenuItem6.ToolTipText = "프로젝트"; - this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); - // - // toolStripButton1 - // - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(29, 20); - this.toolStripButton1.Text = "구매진행상황"; - this.toolStripButton1.ToolTipText = "구매진행상황"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2); - // - // toolStripButton2 - // - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(29, 20); - this.toolStripButton2.Text = "품목정보"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); - // - // fMain - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); - this.ClientSize = new System.Drawing.Size(1096, 647); - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.menuStrip1); - 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); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.toolStrip1.Location = new System.Drawing.Point(1066, 28); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(29, 594); + this.toolStrip1.TabIndex = 35; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripMenuItem8 + // + this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); + this.toolStripMenuItem8.Name = "toolStripMenuItem8"; + this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem8.Text = "업무일지"; + this.toolStripMenuItem8.ToolTipText = "업무일지"; + this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); + // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem7.Text = "구매신청"; + this.toolStripMenuItem7.ToolTipText = "구매신청"; + this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem6.Text = "프로젝트"; + this.toolStripMenuItem6.ToolTipText = "프로젝트"; + this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // + // toolStripButton1 + // + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(26, 20); + this.toolStripButton1.Text = "구매진행상황"; + this.toolStripButton1.ToolTipText = "구매진행상황"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2); + // + // toolStripButton2 + // + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(26, 20); + this.toolStripButton2.Text = "품목정보"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // + // fMain + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.ClientSize = new System.Drawing.Size(1096, 647); + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.menuStrip1); + 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); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1123,6 +1133,7 @@ private System.Windows.Forms.ToolStripMenuItem 휴가사용현황ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 개인별근태원장ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 근태입력오류확인ToolStripMenuItem; - } + private System.Windows.Forms.ToolStripMenuItem 버젼확인ToolStripMenuItem; + } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 9495c84..68b1143 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1096,5 +1096,26 @@ namespace Project var f = new FBS0000.Holiday.fErrorChk(); f.Show(); } - } + + private void 버젼확인ToolStripMenuItem_Click(object sender, EventArgs e) + { + var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + if (MaxVerstion.isEmpty() == false) + { + var curversion = Application.ProductVersion; + var verchk = curversion.CompareTo(MaxVerstion); + if (verchk < 0) + { + //내버젼이 낮다 + Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + } + else + { + Util.MsgI("최신 버젼을 사용하고 있습니다\n\n" + + "서버 : " + MaxVerstion + "\n" + + "현재 : " + curversion); + } + } + } + } } diff --git a/Project/fMain.resx b/Project/fMain.resx index c104de9..68ce91f 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -355,6 +355,16 @@ oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB D4UNMwz8ISAAOw== + + + + + R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c + hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg + USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP + GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE + DQ8eBAjwYKZhhQQPFoRMuXJAADs= diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index 061015e..c74ddc9 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -147,7 +147,10 @@ namespace FBS0000 fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade; fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name; + if (item.empno == "77607") + { + } //이월잔액 var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999"); var used = 0.0; @@ -162,6 +165,7 @@ namespace FBS0000 var ps = (int[])fpSpread1_Sheet1.Columns[c].Tag; + var curDate = sd.AddDays(c - 4); var bholy = false; //이날짜가 휴일인지 체크한다. @@ -217,7 +221,7 @@ namespace FBS0000 ps[2] += 1; //근태기록에 자료가 있는지 확인한다. - var dr = dtHoly.Where(t => t.uid == item.empno && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault(); + var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault(); if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null) //휴일이 아니여야 한다 { diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 6ec65aa..16a6bdb 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -32,6 +32,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -74,10 +75,13 @@ this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); this.dsMSSQL = new FBS0000.dsMSSQL(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton9 = new System.Windows.Forms.ToolStripButton(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); @@ -96,9 +100,6 @@ this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton9 = new System.Windows.Forms.ToolStripButton(); - this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -187,7 +188,6 @@ // 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"; @@ -373,6 +373,16 @@ this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked); // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(28, 28); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // // lbStt // this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -385,7 +395,6 @@ // 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(100, 31); this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -397,15 +406,33 @@ this.toolStripLabel2.Size = new System.Drawing.Size(15, 28); this.toolStripLabel2.Text = "~"; // + // toolStripLabel4 + // + this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(43, 28); + this.toolStripLabel4.Text = "종료일"; + this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); + // // 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(100, 31); this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dtED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); // + // toolStripButton9 + // + this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image"))); + this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton9.Name = "toolStripButton9"; + this.toolStripButton9.Size = new System.Drawing.Size(28, 28); + this.toolStripButton9.Text = "toolStripButton7"; + this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click); + // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; @@ -557,62 +584,34 @@ this.textBox1.TabIndex = 5; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // - // toolStripButton8 - // - this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); - this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(28, 28); - this.toolStripButton8.Text = "toolStripButton7"; - this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); - // - // toolStripButton9 - // - this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image"))); - this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton9.Name = "toolStripButton9"; - this.toolStripButton9.Size = new System.Drawing.Size(28, 28); - this.toolStripButton9.Text = "toolStripButton7"; - this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click); - // - // toolStripLabel4 - // - this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; - this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(43, 28); - this.toolStripLabel4.Text = "종료일"; - this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); this.fpSpread1_Sheet1.SheetName = "WorkTable"; // 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 = 17; + this.fpSpread1_Sheet1.ColumnCount = 18; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구분"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "시작일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "사번"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "성명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사용(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "사용(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "내용"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "발생(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "발생(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "잔량(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "잔량(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "소스"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "등록"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "종료일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사번"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "성명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "사용(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "사용(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "내용"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "발생(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "발생(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "잔량(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "잔량(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "전일(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "소스"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "등록"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; @@ -622,137 +621,146 @@ dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2022, 2, 3, 16, 27, 10, 432); + dateTimeCellType1.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469); this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일"; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "종료일"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번"; - this.fpSpread1_Sheet1.Columns.Get(3).Tag = "empno"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "요일"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType4.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명"; - this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "사번"; + this.fpSpread1_Sheet1.Columns.Get(4).Tag = "empno"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + textCellType4.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + 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 = "name"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); numberCellType1.MaximumValue = 999999999999999D; numberCellType1.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term"; - 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 = "dr"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "term"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(일)"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "dr"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); numberCellType2.MaximumValue = 999999999999999D; numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents"; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용"; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "#"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "CrTime"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "사용(H)"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "drh"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "contents"; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "내용"; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "#"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 40F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); numberCellType3.MaximumValue = 999999999999999D; numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "termDr"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(일)"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "cr"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); numberCellType4.MaximumValue = 999999999999999D; numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "DrTime"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "발생(H)"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "crh"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType5.DecimalPlaces = 1; numberCellType5.MaximumValue = 999999999999999D; numberCellType5.MinimumValue = -999999999999999D; numberCellType5.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(일)"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "jand"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType6.DecimalPlaces = 2; numberCellType6.MaximumValue = 999999999999999D; numberCellType6.MinimumValue = -999999999999999D; numberCellType6.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)"; - this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[2]+RC[-2]-RC[-6]"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "잔량(H)"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "janh"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); numberCellType7.DecimalPlaces = 1; numberCellType7.MaximumValue = 999999999999999D; numberCellType7.MinimumValue = -999999999999999D; numberCellType7.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)"; - this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(일)"; + this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjand"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); numberCellType8.DecimalPlaces = 2; numberCellType8.MaximumValue = 999999999999999D; numberCellType8.MinimumValue = -999999999999999D; numberCellType8.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)"; - this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjanh"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "extcate"; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "소스"; - this.fpSpread1_Sheet1.Columns.Get(15).Tag = "src"; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "전일(H)"; + this.fpSpread1_Sheet1.Columns.Get(15).Tag = "yjanh"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "wuid"; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "extcate"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "등록"; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "소스"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "src"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 70F; + this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "wuid"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "등록"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 70F; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.FrozenColumnCount = 1; diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index 0390c52..4399b48 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -212,23 +212,6 @@ - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi - Dwoi+hDnpKuoiVlGI7sI6iKQqJxDzCVZmjKn7iPmNtsHTk+0D9bSo9tSl86lsJ3TzjbH03vO8thwF77w - 4/Ae+D/v7zznnB38oiiqcvy5DGPNVTDVHgS5dXyb7OeHDzscDsbtsoNy2WC4UYH19fVtIYQolcqdWq32 - pvFpAxyqBhiuVyCVShXAsiwYhhFJJBLIZrP5gEIDK/RXpVsCNkI2SCaTyGQyhQb6Jw2wt8uhvyIFx3EC - D3oiaNZEcI/Q1B1GU1cYjQTeQgwQDZx5g5HLUqTTaQF+WGONoZvw1hJD11gMdzpDQgBvVWAw0irHl1f1 - GL5ULqTz/H+qggzeVdO43UELHQQCgVxRg6EL5UJBfADHpWDzRtDvnEaXJYL39kWMUvNY+72M1dVVhgQc - 3TRQ1mP8pQxD58v+DXPoNs9gmFrGzC8WoTiHidkEDN9WYHTPIR6PF+nAaYX2bKkQwHfw0RlFYCEJd/gP - nHMsHARflEPveBgejwcSieSEaKB7KIOtrQ6D1aViiZ3mMOgYB+csAzvNwBxMgvrJ4Z1tAUtLS1sNpojB - QNUBscRe8syBRRa26fwwz9Q8B9Xoj61fou5+HSwvajFwZjPA6oligk7gKxlyhVOYJKfrPEm0a4YwT+mL - G/SfLkEulxPexMoaC9f3GPpIFx8cUahNIbzWjMJnUGNSJUdTzb4WwUChUJT0VB/C4LVj6DtVApqmEQwG - 4ff74fV6hcJ8Pp9wtX16g4mOW5gztmGwtTJFLPKrtmzXyUdH9jyuk+6WkW2xX1eksWZvy2flRc707Bz+ - Auv5x/1fRd3rAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR @@ -243,6 +226,23 @@ bNB3uhjZbFZ4E8urLJzfY+glXXywR6AaCeK1WgefQYXxNhkaqvc1CQYKhaK4u+oQBq4dQ++pYtA0jUAg AL/fD6/XKxTm8/mEq+XTG7jab2HO2IKB5ooUscitmtJdJx8d2fO4VrJbSraFfl2R+uq9TZ+VF7mRZ+fw F+UJx/ryG7vdAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi + Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF + H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN + NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4 + gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur + WvRdKhfSef7fVU0G7+po3G6lhQ4mJydzRQ1MF8qFgvgAjsvA4Y+gxzONdlsE712LGKDmsfJ7CclkkiEB + RzcNNLVwvlTAdL7s3zCHjuEZ9FFLmPnFIpTgMDqbgvXbMgbH5pBIJIp04LHDeLZUCOA7+OiJYmohjbHw + H3jmWLgJgSiHLmcYPp8PJSUlJ0QD80MFHM1yGKpLxRLbhsOg4xw8swxcNIPhYBrUTw7vHAuIxWJbDSaI + QW/VAbHELvLOU4ssHNP5YZ6JeQ7agR9bv0TzfTlsL2ToPbMZYPdFMUqn8JUMecMZjJPdzb40WvQmzFOW + 4gY9pyXI5XLCSSyvsPB+j6ObdPHBHYVuKITX+gEErDqMa5Wor9nXKBio1WpJZ/UhGK4dQ/cpCWiaRjAY + 5M8afr9fKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv + 3hnH99rC8mEAAAAASUVORK5CYII= @@ -284,41 +284,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx - C/giaowRQSiibC0Uyg6CyqKSuEaEQvcCFSjgE2oCaiQYNWIUKLLK8U46TagP7b1Dgi89yX2+v8zMuf/J - 9XDHHXcE5OHx1xceHLNY7x/tR8MRsg73of5QH+oSelEb34t7By24e8CCO/vJ2teDmr09qI7rxu093aiK - 7ULl7i5U7HqF8hiyos0oizKjNNKMkohOFId3okjSAWUYWaHtKAxpR0GwyZofZEjkt3edZcZBEWRCbqBp - gt/edZYblx9oQl6AEfz2rvM/cHIxC3AJuLLoTigj9MiTtKFAokNReAcVTu5voAcu5ckVRmrR//gjZqfm - YWn8AHmIhgon28kAFIrjnlx75TssTnG8lgqXu0NPDxSCK4404dGlHiz8WeBpwM+RScjCVFS4HD8GICuu - NKoDVacMmJ6Y5WnA3Mw8as4aoQg2UuGyfXX0QDYcKUWsFt/fj/M0W15I+5EXrKPGZfkwAGlx3FGiCNfg - reYzz7Klu2GIHLxqJlymNwuQElcYroepwrEUw/2j5LtrZcZlemnpgTS4oghSiouOpRj78huFcWry3RmY - cbe2MwBd4Uoi+VJY53iarRTVZ4wgQ18Q7qanhh7oDMeNL0WYDkMdX3maLc9S+iAP0grGZWxjADrDcbM1 - P1SHwXZH4NPkXsgCtYJxN0RqeqAzHDf4lRITyk/oHV/x9DwqTxOQWC8Il76VAegMZx/8ihA9GhO7HUry - i5REHtMKmb+OGSfd0kYPdIWzz1ZZkAb60jc8z5ZPfaPIFDcz49I2swApcPZzLkuswkDbCM+zxVw7iAzf - FiZc2qZWeiAtjiuEPMCAHIkK34bGeJ4tT5IsyPBupcalbmQA0uLsbeW+OWWCBlPji34WSGlKTxKUl5oK - d30DA5AFZ29rlp8a9ec6HUrzY3gCUp8mKlzKehU9kBVnL0SGjwoa5QDPsyU7ooUKl7yOASgEZy+E1Psl - usjfzMzkHMx1g0gVNVHhrq1toQcKxdkLIfVsQYroOcE1I13URoVLWsMCXAKOthD/4pJWN9MD/wfu6ioG - IMFZlxt3eWUT/dUHd5HD3ZUsJ+7Kiqbz/PbuuOMOfTw8/gIMiT37T9A/6AAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB1aNkXcwDUaExPj + F/BF1BgjglBE2VooLTsIKotK4hoRSncKrVCgPqEmoEaCUSNG2WSV4510mlAf6L1Dgi89yX2+v8zMuf/J + 9XDHHXcE5OHx1xceHLOO3z9qQ8MRsg73ov5QL+oSe1Cb0IN7B7tx90A37uwna58VNXutqI7vwu09XaiK + 60Tl7k5U7HqF8liyYiwoi7agNMqCkkgzisVmFIk6oIwgK7wdirB2FIaaxgtCjEn89q6zzDjIQ0zICzaN + 8du7znLjCoJNyA9qA7+96/wPnCyQBbgEXFmMGcpIA/JFahSK9CgSd1DhZAFGeuBSnpwiSgfb44+YmZxD + d+MHyMK0VDjpTgagUBz35Nor32FhihN0VLi8HQZ6oBBccZQJjy5ZMf9nnqcBP4cmII1QUeFy/RmArLjS + 6A5UnTJiamyGpwGz03OoOdsGeWgbFS7HT08PZMORUsTp8P39KE+z54XEhvxQPTUu25cBSIvjjhK5WIu3 + 2s88y56uhgFy8GqYcFk+LEBKnEJsgKnCuRSDtmHy3bUy47K8dfRAGlxRJCnFRedSjHz5DUW8hnx3Rmbc + re0MQFe4kii+FOOzPM1eiuozbSBDXxDuppeWHrgYjhtf8gg9Bjq+8jR7nqX2QhaiE4zL3MYAXAzHzdaC + cD36252BT1N6IA3WCcbd8NTQAxfDcYNfKTKh/ITB+RVPzaHyNAEFGgThMrYyABfDOQa/PMyAxqQup5L8 + IiWRxbZCGqBnxkm2qOmBrnCO2SoN0cJQ+obn2fOpdxhZgc3MuPTNLEAKnOOcyw5UoU89xPPssdT2I9Ov + hQmXvqmVHkiL4wohCzIiV6TCt4ERnmfPk+RuZPq0UuPSNjIAaXGOtnLfnDJRi8nRBT8LpDSlJwnKW0OF + u76BAciCc7Q121+D+nNmp9L8GByDxLeJCpe6XkUPZMU5CpHpq4JW2cfz7MmJbKHCpaxjAArBOQoh8XmJ + TvI3Mz0xC0tdP9I8m6hw19a20AOF4hyFkHi1INXzOcE1I8NTTYVLXsMCXAKOthD/4pJXN9MD/wfu6ioG + IMGNLzfu8som+qsP7iKHuytZTtyVFU3n+e3dcccd+nh4/AXhRz35FoyUPQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBwaUguAtuidHE - B999cUuMCi4oYktpsbbFoogLgqJRMVHEbkOnrUApBZ40kqCQuCVqJJESWZTjDDONEpP23jGpLz3Jfb6/ - zJ0z380kxBNPPBJyd3vnodptwdCdrR24vYVbue2oyWlH9eYgbm0KompjG25uaMON9dxaF8D1tQFcW9OK - yuxWXM3yo2K1H1cyW3A5g1vqZpSvaoZ1ZTMurWhC2fImWNKfw5zGrWU+mFJ9uJjiDV1IZg+K20dPjHEw - JnuhV3n7xe2jJ9a4CyovSpUeiNtHz//AGZJogIS4q9l+WDM9MKmdKFOzKM9olowzJLLkQNInV5bBouNB - D4a//0BnXS/MqxjJOP1SCiDxse5g8Wd8Fa9gWu6WhCtZ4iYHkr5zliwGfe8HRB4w+nMU9w8HYEr3UON0 - iymApIWwqptQtdc3dsThDIVGULGLhSnNS4UrVjSSA0lw4bZaVnrw+FSHyBPypbcfxkwHLqZ6iXFaOQWQ - FBcuhDGtEYHa1yJPSBf7ESXJdmKcRkYDpMCFC2FIt6Mn8FnkCXFbX0KndBHhNIsYciAtji+EKY1717Ic - 6Hv3R2lGgXuH/ChOdEXFnV9IAaTFhdtqTPGgcg+LkcHfpRnsH4Yl14WSpY0RcUULXORAKbhwW/UqBo/y - gyJPSJfnI4oUtoi4c/MpgFJxfCFKlAzq8sYDX7k/cEB7RFzhPCc5UCrOoGRxZbf7ryM2bXZCq2Ai4s7O - pQBKwZWqPNCrbfj6NiTShJLU7m9BkdweFXdmjoMcSIvjv3MaZQPeBD6JNCGM+QXOyW1EuILZNEBKnDbR - gZaabpEl5CXzHoWKp8S4gll2ciANTpfkwsNjbSJLyOc336BJbYBGzhDjTs+kAJLi9ElulO90j7ssDHKX - BXOOkxp3agYFkATHjy+t6tn4UnDXrep9TSiSOahxJ6fbyIEkOH62GrMdIk0IX4pCmU0S7sQ0CiAJjp+t - 5xfb0HqnG0MDI/Df7sZZ+VPJuPypz8iBJDh+8OuWNI5NiDOyJ//05Hhc3hQaIAEu2uCnxeVNbiAH/g/c - 8UkUQA4XijXuyMR68l8f/I8c/l9JLHFHJ9QfELePJ554yJOQ8AvCuz6iy+fZHAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji + g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6dFSmkBnySQIJAokoiRREpkUY4zzjRKTNp7xwRfepL7fH+Z + O2e+mwkKJJBAJOThwTdn6g+4PQ/2d+H+Pm6ldKIuuRO1eztwb08Hana7cXeXG3d2cmuHC7e3u3BrWzuq + k9pxM9GJqq1O3Ehow/V4bqkcqIxzoCLWgWtbWlG+uRVlMa9RquTWphboo1tQEmX3XI1kT4vb+88c46CL + tEOrsI+J2/vPXOOuKuwoltsgbu8//wNXFEEDJMTdTHKiIsEGvcqMchWLyniHZFxROEsOJH1y5fEsup4M + YOrbd7xpGERpHCMZVxhGASQ+1kMs/kxLVQ/0m62ScNpQKzmQ9J0rS2QwOjQu8oCZHzN4fNYFfYyNGlew + kQJIWogKVStqjrf8OmJvJj3TqDrCQq+0U+HyQ5rJgSQ4b1vLYm14nt4l8oR8HhyDLsGEkmg7MS5PRgEk + xXkLoVM2w1X/TuQJ6WWHoY00EuM0wTRACpy3EEUxRgy4RkSeEGtFNwrkFiKcZgNDDqTF8YXQK7l3LdGE + 0Q9/lGYGeHTGifxwi19c7noKIC3O21ZdlA3Vx1hMT/wuzcTYFMpSLNCGNfvEqddZyIFScN62FioYPEvr + EHlCem3DUIcYfOJy1lIApeL4QmjlDBpSZwN7rB85oNEnLnuNmRwoFVckZ3HjqPWvI9bvNSMvhPGJy1pN + AZSCK1bYUKgy4Mt7j0gTSlJ/sg1qmdEvLnOViRxIi+O/cxp5E/pdn0SaEKb0LXJkBiJcxkoaICUuL9yE + tro+kSWkmxlCdshLYlzGCiM5kAZXEGHB0wtukSVkpP8rNNFN0MgYYtyV5RRAUlxhhBWVh62zLgsT3GWh + NNlMjUtfRgEkwfHjK0/xanYpuOtW7YlWqINN1LjLSw3kQBIcP1t1SSaRJoQvRXawQRLu0hIKIAmOn625 + Gw1of9CHyfFpOO/3IUv2UjIubfErciAJjh/8BaHNvyZEZvCLf3pyPC51EQ2QAOdv8NPiUhc2kQP/B+7i + Agogh/PMNe7c/EbyXx/8jxz+X8lc4s7Pazwlbh9IIIGQJyjoJ38CPp5C2VW3AAAAAElFTkSuQmCC @@ -389,6 +389,16 @@ AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA AAD/////AQgAAP////8AAQgAAAs= + + + + + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs index a965fd0..73b8abe 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs @@ -36,6 +36,7 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label4; System.Windows.Forms.Label label5; + System.Windows.Forms.Label label6; this.dsMSSQL = new FBS0000.dsMSSQL(); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager(); @@ -48,6 +49,7 @@ this.cmbType = new System.Windows.Forms.ComboBox(); this.nudDrHour = new System.Windows.Forms.NumericUpDown(); this.nudDrDay = new System.Windows.Forms.NumericUpDown(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); sdateLabel = new System.Windows.Forms.Label(); contentsLabel = new System.Windows.Forms.Label(); uidLabel = new System.Windows.Forms.Label(); @@ -56,6 +58,7 @@ label3 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCrDAy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCrHour)).BeginInit(); @@ -66,21 +69,21 @@ // sdateLabel // sdateLabel.AutoSize = true; - sdateLabel.Location = new System.Drawing.Point(44, 49); + sdateLabel.Location = new System.Drawing.Point(30, 49); sdateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sdateLabel.Name = "sdateLabel"; - sdateLabel.Size = new System.Drawing.Size(37, 19); + sdateLabel.Size = new System.Drawing.Size(51, 19); sdateLabel.TabIndex = 2; - sdateLabel.Text = "기간"; + sdateLabel.Text = "시작일"; // // contentsLabel // contentsLabel.AutoSize = true; - contentsLabel.Location = new System.Drawing.Point(42, 113); + contentsLabel.Location = new System.Drawing.Point(44, 148); contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); contentsLabel.Name = "contentsLabel"; contentsLabel.Size = new System.Drawing.Size(37, 19); - contentsLabel.TabIndex = 6; + contentsLabel.TabIndex = 8; contentsLabel.Text = "내용"; // // uidLabel @@ -100,7 +103,7 @@ label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label1.Name = "label1"; label1.Size = new System.Drawing.Size(51, 19); - label1.TabIndex = 12; + label1.TabIndex = 14; label1.Text = "사용일"; // // label2 @@ -110,7 +113,7 @@ label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(65, 19); - label2.TabIndex = 14; + label2.TabIndex = 16; label2.Text = "사용시간"; // // label3 @@ -120,7 +123,7 @@ label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(65, 19); - label3.TabIndex = 10; + label3.TabIndex = 12; label3.Text = "발생시간"; // // label4 @@ -130,17 +133,17 @@ label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; label4.Size = new System.Drawing.Size(51, 19); - label4.TabIndex = 8; + label4.TabIndex = 10; label4.Text = "발생일"; // // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(44, 81); + label5.Location = new System.Drawing.Point(44, 115); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(37, 19); - label5.TabIndex = 4; + label5.TabIndex = 6; label5.Text = "구분"; // // dsMSSQL @@ -164,13 +167,13 @@ // // contentsTextBox // - this.contentsTextBox.Location = new System.Drawing.Point(87, 113); + this.contentsTextBox.Location = new System.Drawing.Point(87, 145); this.contentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.contentsTextBox.Multiline = true; this.contentsTextBox.Name = "contentsTextBox"; this.contentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.contentsTextBox.Size = new System.Drawing.Size(460, 184); - this.contentsTextBox.TabIndex = 7; + this.contentsTextBox.Size = new System.Drawing.Size(460, 152); + this.contentsTextBox.TabIndex = 9; // // dateTimePicker1 // @@ -194,7 +197,7 @@ this.btOK.Location = new System.Drawing.Point(87, 373); this.btOK.Name = "btOK"; this.btOK.Size = new System.Drawing.Size(460, 38); - this.btOK.TabIndex = 16; + this.btOK.TabIndex = 18; this.btOK.Text = "OK"; this.btOK.UseVisualStyleBackColor = true; this.btOK.Click += new System.EventHandler(this.btOK_Click); @@ -210,7 +213,7 @@ 0}); this.nudCrDAy.Name = "nudCrDAy"; this.nudCrDAy.Size = new System.Drawing.Size(183, 27); - this.nudCrDAy.TabIndex = 13; + this.nudCrDAy.TabIndex = 15; this.nudCrDAy.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // nudCrHour @@ -224,16 +227,16 @@ 0}); this.nudCrHour.Name = "nudCrHour"; this.nudCrHour.Size = new System.Drawing.Size(197, 27); - this.nudCrHour.TabIndex = 15; + this.nudCrHour.TabIndex = 17; this.nudCrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // cmbType // this.cmbType.FormattingEnabled = true; - this.cmbType.Location = new System.Drawing.Point(87, 78); + this.cmbType.Location = new System.Drawing.Point(87, 112); this.cmbType.Name = "cmbType"; this.cmbType.Size = new System.Drawing.Size(462, 27); - this.cmbType.TabIndex = 5; + this.cmbType.TabIndex = 7; // // nudDrHour // @@ -246,7 +249,7 @@ 0}); this.nudDrHour.Name = "nudDrHour"; this.nudDrHour.Size = new System.Drawing.Size(197, 27); - this.nudDrHour.TabIndex = 11; + this.nudDrHour.TabIndex = 13; this.nudDrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // nudDrDay @@ -260,14 +263,33 @@ 0}); this.nudDrDay.Name = "nudDrDay"; this.nudDrDay.Size = new System.Drawing.Size(183, 27); - this.nudDrDay.TabIndex = 9; + this.nudDrDay.TabIndex = 11; this.nudDrDay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // dateTimePicker2 + // + this.dateTimePicker2.Location = new System.Drawing.Point(87, 78); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(462, 27); + this.dateTimePicker2.TabIndex = 5; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(30, 82); + label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(51, 19); + label6.TabIndex = 4; + label6.Text = "종료일"; + // // fHolyday_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(566, 430); + this.Controls.Add(this.dateTimePicker2); + this.Controls.Add(label6); this.Controls.Add(this.contentsTextBox); this.Controls.Add(this.nudDrHour); this.Controls.Add(label3); @@ -317,5 +339,6 @@ private System.Windows.Forms.ComboBox cmbType; private System.Windows.Forms.NumericUpDown nudDrHour; private System.Windows.Forms.NumericUpDown nudDrDay; + private System.Windows.Forms.DateTimePicker dateTimePicker2; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 66666ea..ccb4e17 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -60,7 +60,7 @@ namespace FBS0000 { 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; + dateTimePicker2.Value = dr.edate; cmbType.Text = dr.cate; contentsTextBox.Text = dr.contents; @@ -92,6 +92,15 @@ namespace FBS0000 return; } + + var vs = dateTimePicker1.Value; + var ve = dateTimePicker2.Value; + if(ve < vs) + { + FCOMMON.Util.MsgE("종료일이 시작일보다 작습니다"); + return; + } + var usertxt = cmbUser.Text.Trim(); var userid = usertxt.Substring(usertxt.IndexOf('(')+1, usertxt.LastIndexOf(')') - usertxt.IndexOf('(') -1); @@ -103,8 +112,8 @@ namespace FBS0000 dr.uid = userid;// cmbType.SelectedValue.ToString(); dr.sdate = dateTimePicker1.Value; - dr.edate = dr.sdate; - // dr.edate = dateTimePicker2.Value; + // dr.edate = dr.sdate; + dr.edate = dateTimePicker2.Value; dr.cate = cmbType.Text; dr.contents = contentsTextBox.Text; diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.resx b/SubProject/FBS0000/Holiday/fHolyday_Add.resx index 25994aa..d324a61 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.resx +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.resx @@ -150,4 +150,7 @@ 248, 17 + + False + \ No newline at end of file diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 51dfe3e..8b12e3d 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -6,1202 +6,1217 @@ using System.Data.SqlClient; namespace FCOMMON { - public static partial class DBM - { - public static SqlConnection getCn() - { - string cs = FCOMMON.info.CS; - SqlConnection cn = new SqlConnection(); - cn.ConnectionString = cs; - return cn; - } - - public struct sItemInfo - { - public int idx; - public string sid; - public string model; - public string supply; - public string name; - public string unit; - public float scale; - public string price; - public int supplyidx; - public string project; - public int qty; - } - - public static byte[] getImagByteArray(System.Drawing.Image img) - { - if (img == null || img.Width < 1 || img.Height < 1) return null; - - //이미지가 640보다 크면 조정한다. - if (img.Width > 640) - { - var newrate = (640.0 / img.Width * 1.0); - var newheight = (int)(img.Height * newrate); //높이값 다시 계산 - var newimg = new System.Drawing.Bitmap(640, newheight); - var g = System.Drawing.Graphics.FromImage(newimg); - g.DrawImage(img, new System.Drawing.Rectangle(0, 0, 640, newheight)); - g.Dispose(); - img = (System.Drawing.Image)(newimg.Clone()); - - } - else if (img.Height > 480) - { - var newrate = (480.0 / img.Height * 1.0); - var newwidth = (int)(img.Width * newrate); //높이값 다시 계산 - var newimg = new System.Drawing.Bitmap(newwidth, 480); - var g = System.Drawing.Graphics.FromImage(newimg); - g.DrawImage(img, new System.Drawing.Rectangle(0, 0, newwidth, 480)); - g.Dispose(); - img = (System.Drawing.Image)(newimg.Clone()); - } - - - - System.IO.MemoryStream sm = new System.IO.MemoryStream(); - img.Save(sm, System.Drawing.Imaging.ImageFormat.Jpeg); - var buffer = sm.GetBuffer(); - sm.Dispose(); - return buffer; - } - public static Boolean setImageData(System.Drawing.Bitmap img, string table, string field, int idx) - { - return setImageData((System.Drawing.Image)img, table, field, idx); - } - public static Boolean setImageData(System.Drawing.Image img, string table, string field, int idx) - { - if (img == null || img.Width < 1 || img.Height < 1) return false; - - //이미지가 640보다 크면 조정한다. - if (img.Width > 640) - { - var newrate = (640.0 / img.Width * 1.0); - var newheight = (int)(img.Height * newrate); //높이값 다시 계산 - var newimg = new System.Drawing.Bitmap(640, newheight); - var g = System.Drawing.Graphics.FromImage(newimg); - g.DrawImage(img, new System.Drawing.Rectangle(0, 0, 640, newheight)); - g.Dispose(); - img = (System.Drawing.Image)(newimg.Clone()); - - } - else if (img.Height > 480) - { - var newrate = (480.0 / img.Height * 1.0); - var newwidth = (int)(img.Width * newrate); //높이값 다시 계산 - var newimg = new System.Drawing.Bitmap(newwidth, 480); - var g = System.Drawing.Graphics.FromImage(newimg); - g.DrawImage(img, new System.Drawing.Rectangle(0, 0, newwidth, 480)); - g.Dispose(); - img = (System.Drawing.Image)(newimg.Clone()); - } - - var cn = getCn(); - cn.Open(); - - Boolean retval = false; - string sql = "update " + table + " set " + field + " = @data" + " where idx = @idx"; - var cmd = new SqlCommand(sql, cn); - - System.IO.MemoryStream sm = new System.IO.MemoryStream(); - img.Save(sm, System.Drawing.Imaging.ImageFormat.Jpeg); - var buffer = sm.GetBuffer(); - sm.Dispose(); - - cmd.Parameters.Add(new SqlParameter("idx", idx)); - cmd.Parameters.Add(new SqlParameter("data", buffer)); - try - { - cmd.ExecuteNonQuery(); - retval = true; - } - catch - { - - } - - cn.Close(); - cn.Dispose(); - return retval; - } - - - /// - /// 지정쿼리를 실행합니다. - /// - /// - /// - public static int ExecuteNonQuery(string sql) - { - var cn = getCn(); - cn.Open(); - var cmd = new SqlCommand(sql, cn); - var retval = cmd.ExecuteNonQuery(); - cn.Close(); - cn.Dispose(); - return retval; - } - public static int ExecuteScalarI(string sql) - { - var cn = getCn(); - cn.Open(); - var cmd = new SqlCommand(sql, cn); - var retval = (int)(cmd.ExecuteScalar()); - cn.Close(); - cn.Dispose(); - return retval; - } - public static string ExecuteScalar(string sql) - { - var cn = getCn(); - cn.Open(); - var cmd = new SqlCommand(sql, cn); - var retval = cmd.ExecuteScalar().ToString(); - cn.Close(); - cn.Dispose(); - return retval; - } - public static System.Drawing.Image GetImageData(string table, string field, int idx) - { - var cn = getCn(); - cn.Open(); - - - string sql = "select " + field + " from " + table + " where idx = " + idx.ToString(); - var cmd = new SqlCommand(sql, cn); - var data = cmd.ExecuteScalar() as byte[]; - System.Drawing.Bitmap bmp = null; - if (data != null) - { - System.IO.MemoryStream ms = new System.IO.MemoryStream(data); - bmp = new System.Drawing.Bitmap(ms, true); - ms.Dispose(); - } - cn.Close(); - cn.Dispose(); - return bmp; - } - - public static sItemInfo getLastPurchaseInfo(int idx) - { - var cn = getCn(); - cn.Open(); - - var retval = new sItemInfo(); - retval.idx = -1; - - string sql = "select isnull(max(idx),-1) from Purchase where pumidx = " + idx.ToString(); - var cmd = new SqlCommand(sql, cn); - int maxidx = int.Parse(cmd.ExecuteScalar().ToString()); - if (maxidx == -1) return retval; - - cmd.CommandText = "select * from Purchase where idx = " + maxidx.ToString(); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.idx = (int)rdr["idx"]; - if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); - if (rdr["pumscale"] != DBNull.Value) retval.model = rdr["pumscale"].ToString(); - if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); - if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); - else retval.supplyidx = -1; - - if (rdr["pumname"] != DBNull.Value) retval.name = rdr["pumname"].ToString(); - if (rdr["pumunit"] != DBNull.Value) retval.unit = rdr["pumunit"].ToString(); - if (rdr["project"] != DBNull.Value) retval.project = rdr["project"].ToString(); - - if (rdr["pumprice"] != DBNull.Value) retval.price = rdr["pumprice"].ToString(); - else retval.price = "0"; - - if (rdr["pumqty"] != DBNull.Value) retval.qty = int.Parse(rdr["pumqty"].ToString()); - else retval.qty = 0; - - } - - cn.Close(); - cn.Dispose(); - return retval; - } - - public static Dictionary GetUserHolidayJan(string gcode, string uid, string pdate) - { - var cn = getCn(); - cn.Open(); - - var retval = new Dictionary(); - var dt = DateTime.Parse(pdate); - var dtys = dt.Year.ToString("0000") + "-01-01"; - - string sql = "select isnull(cate,'--'), isnull(sum(termdr),0), isnull(sum(term),0), isnull(sum(termdr)-sum(term),0) , isnull(sum(drtime),0),isnull(sum(crtime),0), isnull(sum(drtime)-sum(crtime),0) as JanTime" + - " from Holyday " + - " where gcode=@gcode and uid = @uid and sdate between @sdate and @edate group by cate order by cate"; - - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode; - cmd.Parameters.Add("uid", System.Data.SqlDbType.VarChar).Value = uid; - cmd.Parameters.Add("sdate", System.Data.SqlDbType.VarChar).Value = dtys; - cmd.Parameters.Add("edate", System.Data.SqlDbType.VarChar).Value = pdate; - - - - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}"); - } - - cn.Close(); - cn.Dispose(); - return retval; - } - - /// - /// 서플라이정보를 찾습니다. 1개의데이터가 검색된 경우에만 사용 됩니다. - /// - /// - /// - /// - /// - /// - public static Boolean getFindSupply(string nameLike, out int idx, out string nameK, out string nameE) - { - idx = -1; - nameE = ""; - nameK = ""; - - var cn = getCn(); - cn.Open(); - - string sql = "select idx,name,name2 from Customs where (name like '%SEEMAX%' or name2 like '%{0}%')"; - sql = string.Format(sql, nameLike); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - - int cnt = 0; - while (rdr.Read()) - { - idx = (int)rdr["idx"]; - if (rdr["name"] != DBNull.Value) nameK = rdr["name"].ToString(); - if (rdr["name2"] != DBNull.Value) nameE = rdr["name2"].ToString(); - cnt += 1; - } - - cn.Close(); - cn.Dispose(); - return cnt == 1; - } - - /// - /// 프로젝트 주간내역을 추가합니다 - /// - /// - /// - /// - public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message, string rtf) - { - - var cn = getCn(); - cn.Open(); - - string sql = - "insert into ProjectsHistory(pidx,pdate,remark,remark2,wuid,wdate)" + - " values(@pidx,@pdate,@remark,@remark2,@wuid,@wdate)"; - - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add(new SqlParameter("pidx", ProjectIdx)); - cmd.Parameters.Add(new SqlParameter("pdate", pdate)); - cmd.Parameters.Add(new SqlParameter("remark", Message)); - cmd.Parameters.Add(new SqlParameter("remark2", rtf)); - cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); - cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); - var cnt = cmd.ExecuteNonQuery(); - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return cnt == 1; - } - - public static sItemInfo getItemInfo(int idx) - { - var cn = getCn(); - cn.Open(); - - var retval = new sItemInfo(); - retval.idx = -1; - - string sql = "select * from Items where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString(); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.idx = (int)rdr["idx"]; - if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); - if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString(); - if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); - if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); - - if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString(); - if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString(); - if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString()); - if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString(); - - } - - cn.Close(); - cn.Dispose(); - return retval; - } - public static int addItemInfo(sItemInfo info) - { - int retval = -1; - var cn = getCn(); - cn.Open(); - - string sql = "insert into Items" + - " ([gcode],[cate],[sid],[model],[supply],[supplyidx],[name],[unit],[scale],[price],[wuid],[wdate])" + - " values " + - " (@gcode,@cate,@sid,@model,@supply,@supplyidx,@name,@unit,@scale,@price,@wuid,@wdate)"; - - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add(new SqlParameter("@gcode", FCOMMON.info.Login.gcode)); - cmd.Parameters.Add(new SqlParameter("@cate", "etc")); - cmd.Parameters.Add(new SqlParameter("@sid", info.sid)); - cmd.Parameters.Add(new SqlParameter("@model", info.model)); - cmd.Parameters.Add(new SqlParameter("@supply", info.supply)); - cmd.Parameters.Add(new SqlParameter("@supplyidx", info.supplyidx)); - cmd.Parameters.Add(new SqlParameter("@name", info.name)); - cmd.Parameters.Add(new SqlParameter("@unit", info.unit)); - cmd.Parameters.Add(new SqlParameter("@scale", info.scale)); - cmd.Parameters.Add(new SqlParameter("@price", info.price)); - cmd.Parameters.Add(new SqlParameter("@wuid", FCOMMON.info.Login.no)); - cmd.Parameters.Add(new SqlParameter("@wdate", DateTime.Now)); - - var iCnt = cmd.ExecuteNonQuery(); - if (iCnt == 1) - { - cmd.CommandText = "select isnull(idx,-1) from Items where gcode=@gcode and [sid] = @sid"; - cmd.Parameters.Clear(); - cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); - cmd.Parameters.Add(new SqlParameter("sid", info.sid)); - retval = (int)cmd.ExecuteScalar(); - } - - cn.Close(); - cn.Dispose(); - return retval; - } - public static sItemInfo getItemInfo(string sid) - { - var cn = getCn(); - cn.Open(); - - var retval = new sItemInfo(); - retval.idx = -1; - - string sql = "select * from Items where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'"; - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.idx = (int)rdr["idx"]; - if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); - if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString(); - if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); - if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); - - if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString(); - if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString(); - if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString()); - if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString(); - } - - cn.Close(); - cn.Dispose(); - return retval; - } - public static Dictionary getUserList(int baseLevel = 1) - { - string where = "isnull(level,0) >= " + baseLevel.ToString(); - return getTwoColumnList("vGroupUser", "id", "name", where, "name"); - - } - - /// - /// id,name,dispname,dept,email,level,tel,process,grade - /// - /// - /// - public static System.Data.DataTable getUserTable(int baseLevel = 1) - { - var cn = getCn(); - cn.Open(); - - var retval = new sItemInfo(); - retval.idx = -1; - - string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,isnull([dept],'') as dept,isnull(grade,'') as grade,[email],[level],[tel],isnull(processs,'') as process,isnull(indate,'') as indate, isnull(outdate,'') as outdate " + - " from vGroupUser " + - " where gcode='" + FCOMMON.info.Login.gcode + "' and [id] <> 'dev' and isnull(outdate,'') = '' and useUserState = 1 order by [name]"; - var cmd = new SqlCommand(sql, cn); - var da = new SqlDataAdapter(sql, cn); - var ds = new System.Data.DataSet(); - da.Fill(ds); - cn.Close(); - cn.Dispose(); - if (ds.Tables.Count > 0) return ds.Tables[0]; - else return null; - } - - private static Dictionary MakeDataTable(List list) - { - var retval = new Dictionary(); - foreach (var item in list) - retval.Add(item, item); - return retval; - } - private static System.Data.DataTable MakeDataTable(Dictionary list) - { - System.Data.DataTable dt = new System.Data.DataTable(); - dt.Columns.Add("Key"); - dt.Columns.Add("Value"); - dt.Columns.Add("KeyValue"); - - foreach (var item in list) - { - dt.Rows.Add(new string[] { item.Key, item.Value, string.Format("[{0}] {1}", item.Key, item.Value) }); - } - dt.AcceptChanges(); - return dt; - } - - public static Dictionary getProjectList(string StateCode = "") - { - string where = "status = '{0}'"; - if (StateCode != "") where = string.Format(where, StateCode); - else where = string.Empty; - - return getTwoColumnList("Projects", "idx", "name", where, "status,name"); - } - public static System.Data.DataTable getProjectData(string StateCode = "") - { - var list = getProjectList(StateCode); - return MakeDataTable(list); - } - public static Dictionary getCodeList(string GroupCode = "99") - { - string where = "Grp = '{0}'"; - where = string.Format(where, GroupCode); - return getTwoColumnList("Common", "code", "memo", where, "code"); - } - public static string getCodeSavlue(string GroupCode, string code) - { - var cn = getCn(); - cn.Open(); - var sql = "select isnull(SValue,'')" + - " from Common" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'"; - - sql = string.Format(sql, GroupCode, code); - var cmd = new SqlCommand(sql, cn); - var data = cmd.ExecuteScalar(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return data.ToString(); - } - - public struct sCodeData - { - public string code; - public string title; - public string svalue; - public string grp; - } - public static sCodeData getCodeBySvalue(string GroupCode, string svalue) - { - var retval = new sCodeData(); - retval.code = string.Empty; - retval.title = string.Empty; - retval.svalue = string.Empty; - retval.grp = string.Empty; - - var cn = getCn(); - cn.Open(); - var sql = "select isnull(code,''),isnull(memo,'')" + - " from Common" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and svalue = '{1}'"; - - sql = string.Format(sql, GroupCode, svalue); - var cmd = new SqlCommand(sql, cn); - var da = cmd.ExecuteReader(); - while (da.Read()) - { - retval.code = da[0].ToString(); - retval.title = da[1].ToString(); - } - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - retval.grp = GroupCode; - retval.svalue = svalue; - return retval; - } - public static sCodeData getCodeByMemo(string GroupCode, string memo) - { - var retval = new sCodeData(); - retval.code = string.Empty; - retval.title = string.Empty; - retval.svalue = string.Empty; - retval.grp = string.Empty; - - - var cn = getCn(); - cn.Open(); - var sql = "select isnull(code,''),isnull(memo,'')" + - " from Common" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and memo = '{1}'"; - - sql = string.Format(sql, GroupCode, memo); - var cmd = new SqlCommand(sql, cn); - var da = cmd.ExecuteReader(); - while (da.Read()) - { - retval.code = da[0].ToString(); - retval.title = da[1].ToString(); - } - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - retval.grp = GroupCode; - retval.svalue = memo; - return retval; - } - - public static Boolean InsertLog(string cate, string remark, string pdate = "") - { - if (String.IsNullOrEmpty(pdate)) pdate = DateTime.Now.ToShortDateString(); - - try - { - var cn = getCn(); - cn.Open(); - var sql = "insert into EETGW_Log(gcode,pdate,cate,remark,wuid,wdate)" + - " values(@gcode,@pdate,@cate,@remark,@wuid,@wdate)"; - - //sql = string.Format(sql, info.Login.gcode, memo); - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); - cmd.Parameters.Add(new SqlParameter("pdate", pdate)); - cmd.Parameters.Add(new SqlParameter("cate", cate)); - cmd.Parameters.Add(new SqlParameter("remark", remark)); - cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); - cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); - var da = cmd.ExecuteNonQuery(); - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return da > 0; - } - - catch {} - return false; - } - - - public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "") - { - - var cn = getCn(); - cn.Open(); - var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" + - " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)"; - - sql = string.Format(sql, GroupCode, memo); - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); - cmd.Parameters.Add(new SqlParameter("grp", GroupCode)); - cmd.Parameters.Add(new SqlParameter("code", code)); - cmd.Parameters.Add(new SqlParameter("memo", memo)); - cmd.Parameters.Add(new SqlParameter("svalue", svalue)); - cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); - cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); - var da = cmd.ExecuteNonQuery(); - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return da > 0; - } - - public static sCodeData getCodeByCode(string GroupCode, string code) - { - var retval = new sCodeData(); - retval.code = string.Empty; - retval.title = string.Empty; - retval.svalue = string.Empty; - retval.grp = string.Empty; - - var cn = getCn(); - cn.Open(); - var sql = "select isnull(code,''),isnull(memo,'')" + - " from Common" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'"; - - sql = string.Format(sql, GroupCode, code); - var cmd = new SqlCommand(sql, cn); - var da = cmd.ExecuteReader(); - while (da.Read()) - { - retval.code = da[0].ToString(); - retval.title = da[1].ToString(); - } - - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - retval.grp = GroupCode; - retval.svalue = code; - return retval; - } - - /// - /// 지정된 프로젝트의 마지막 업무일지 데이터를 반환함 - /// - /// - /// - public static System.Data.DataTable getLastJobReportData(string uid, int projectIdx) - { - var cn = getCn(); - cn.Open(); - var sql = "select top 1 * from JobReport" + - " where gcode ='" + FCOMMON.info.Login.gcode + "' and isnull(pidx,-1)=" + projectIdx.ToString() + - " and uid ='" + uid + "'" + - " order by pdate desc, idx desc"; - var da = new SqlDataAdapter(sql, cn); - var ds = new System.Data.DataSet(); - da.Fill(ds); - cn.Close(); - if (ds.Tables.Count > 0) return ds.Tables[0]; - else return null; - } - public static System.Data.DataTable getLastJobReportDatabyProjectName(string uid, string prjName) - { - var cn = getCn(); - cn.Open(); - var sql = "select top 1 * from JobReport" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(projectName,'') like '" + prjName + "'" + - " and uid ='" + uid + "'" + - " order by pdate desc, idx desc"; - var da = new SqlDataAdapter(sql, cn); - var ds = new System.Data.DataSet(); - da.Fill(ds); - cn.Close(); - if (ds.Tables.Count > 0) return ds.Tables[0]; - else return null; - } - public static System.Data.DataTable getLastJobReportData(string uid, string type) - { - var cn = getCn(); - cn.Open(); - var sql = "select top 1 * from JobReport" + - " where gcode = '" + FCOMMON.info.Login.gcode + "' and isnull([type],'')='" + type + "'" + - " and uid ='" + uid + "'" + - " order by pdate desc, idx desc"; - var da = new SqlDataAdapter(sql, cn); - var ds = new System.Data.DataSet(); - da.Fill(ds); - cn.Close(); - if (ds.Tables.Count > 0) return ds.Tables[0]; - else return null; - } - - public static System.Data.DataTable getProcessList() - { - - System.Data.DataTable retval = new System.Data.DataTable(); - retval.Columns.Add("Code"); - retval.Columns.Add("Value"); - - var cn = getCn(); - cn.Open(); - var sql = "select isnull(processs,'') as process" + - " from Users" + - " where processs is not null and gcode='{0}'" + - " group by processs" + - " order by process"; - - sql = string.Format(sql, FCOMMON.info.Login.gcode); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - var cnt = 0; - while (rdr.Read()) - { - retval.Rows.Add(new string[] { cnt.ToString(), rdr[0].ToString() }); - cnt += 1; - } - rdr.Close(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - - - - public static System.Data.DataTable getUserProjectList(string userName) - { - - System.Data.DataTable retval = new System.Data.DataTable(); - retval.Columns.Add("Code"); - retval.Columns.Add("Value"); - retval.Columns.Add("NameOnly"); - - var cn = getCn(); - cn.Open(); - var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'') from Projects" + - " where gcode='{0}'" + - " and (isnull(userManager,'') like '%{1}%'" + - " or isnull(userMain,'') like '%{1}%'" + - " or isnull(usersub,'') like '%{1}%')" + - " and status not in ('보류', '취소', '완료(보고)')" + - " order by status desc,pdate desc,name"; - //" order by pdate desc,name"; - sql = string.Format(sql, FCOMMON.info.Login.gcode, userName); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Rows.Add(new string[] { - rdr[0].ToString(), - rdr[1].ToString(), - rdr[2].ToString() - }); - } - rdr.Close(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - - - public static System.Data.DataTable getCodeTable(string GroupCode = "99", string sort = "memo") - { - - System.Data.DataTable retval = new System.Data.DataTable(); - retval.Columns.Add("Code"); - retval.Columns.Add("Value"); - retval.Columns.Add("SValue"); - - var cn = getCn(); - cn.Open(); - var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,'')" + - " from common" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" + - " and isnull(code,'') <> ''" + - " order by isnull(" + sort + ",'')"; - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString() }); - } - rdr.Close(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - public static Dictionary getTwoColumnList(string table, string col1, string col2, string where = "", string order = "") - { - Dictionary retval = new Dictionary(); - var cn = getCn(); - cn.Open(); - var sql = "select isnull({1},''),isnull({2},'')" + - " from {0} " + - " where gcode = '" + FCOMMON.info.Login.gcode + "' "; - if (where != "") sql += " and " + where; - if (order != "") sql += " order by " + order; - sql = string.Format(sql, table, col1, col2); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Add(rdr[0].ToString(), rdr[1].ToString()); - } - rdr.Close(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - public static List getPlaceList(string gcode) - { - var retval = new List(); - var cn = getCn(); - cn.Open(); - var sql = "select isnull(place,'')" + - " from Inventory " + - " where gcode = '{0}'" + - " order by place"; - sql = string.Format(sql, gcode); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Add(rdr[0].ToString()); - } - rdr.Close(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - public static Dictionary getGroupTable(string GroupColumn, string table, string where = "", Boolean desc = false) - { - var list = getGroupList(GroupColumn, table, where, desc); - return MakeDataTable(list); - } - - /// - /// 데이터중 첫번째 자료를 반환 합니다. - /// - /// - /// - /// - /// - /// - public static String getFirstValue(string column, string table, string where = "", string order = "") - { - string retval = string.Empty; - var cn = getCn(); - cn.Open(); - var sql = "select {0} " + - " from {1} " + - " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' "; - - if (where != "") sql += " and " + where; - if (order != "") sql += " order by " + order; - - sql = string.Format(sql, "[" + column + "]", table); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - if (rdr[0] != null) retval = rdr[0].ToString(); - } - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - - - /// - /// 지정된 사용자/월의 전체 근무시간 초과시간을 반환함 - /// - /// 사용자번호 - /// 지정월(2019-05) - /// 근무시간 - /// 최대근무시간(근무일수*8) - /// 초과근무시간 - public static void getWorkTime(string uid, string yymm, out float work, out int total, out float ot) - { - work = 0; - total = 0; - ot = 0; - string retval = string.Empty; - var cn = getCn(); - - try - { - - cn.Open(); - var sql = "select isnull(sum(hrs),0) as hrs,isnull(sum(ot),0) as ot,dbo.getWorkDayCount('{1}') as workday" + - " from JobReport" + - " where gcode='" + FCOMMON.info.Login.gcode + "' and uid = '{0}' and substring(pdate,1,7) = '{1}'"; - - sql = string.Format(sql, uid, yymm); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - work = float.Parse(rdr[0].ToString()); - ot = float.Parse(rdr[1].ToString()); - total = int.Parse(rdr[2].ToString()) * 8; - } - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - } - catch - { - work = 0; - total = 0; - ot = 0; - } - finally - { - if (cn != null) cn.Dispose(); - } - } - - - public static int addItem(string pumname, string sid, string model, decimal price, string supply, int supplyidx = -1, byte[] pic = null) - { - - var cn = getCn(); - cn.Open(); - - int retval = -1; - var cmd2 = new SqlCommand("", cn); - - cmd2.CommandText = string.Format("select count(*) from Items " + - " where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''")); - var cnt = int.Parse(cmd2.ExecuteScalar().ToString()); - if (cnt == 0) - { - DateTime wdate = DateTime.Now; - - if (pic == null) - { - cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" + - "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)"; - } - else - { - cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,image,wuid,wdate)" + - "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@image,@wuid,@wdate)"; - } - - cmd2.Parameters.Clear(); - cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); - cmd2.Parameters.Add(new SqlParameter("cate", "--")); - cmd2.Parameters.Add(new SqlParameter("name", pumname.Trim())); - cmd2.Parameters.Add(new SqlParameter("sid", sid.Trim())); - cmd2.Parameters.Add(new SqlParameter("model", model.Trim())); - cmd2.Parameters.Add(new SqlParameter("scale", 1.0)); - cmd2.Parameters.Add(new SqlParameter("unit", "EA")); - cmd2.Parameters.Add(new SqlParameter("supply", supply)); - if (pic != null) cmd2.Parameters.Add(new SqlParameter("image", pic)); - cmd2.Parameters.Add(new SqlParameter("supplyidx", supplyidx)); - cmd2.Parameters.Add(new SqlParameter("price", price)); - cmd2.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); - cmd2.Parameters.Add(new SqlParameter("wdate", wdate)); - retval += cmd2.ExecuteNonQuery(); - - //추가된 데이터를 찾아서 다시 검색한다. - //if (retval == 0) - //{ - // cmd2.CommandText = "select idx from Items where gcode=@gcode and name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate"; - // retval = int.Parse(cmd2.ExecuteScalar().ToString()); - //} - //else retval = -1; - } - - //{ - cmd2.CommandText = string.Format("select min(idx) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''")); - var itemdata = cmd2.ExecuteScalar(); - if (itemdata == DBNull.Value || itemdata == null) - { - retval = -1; - } - else - { - var strItem = itemdata.ToString(); - if (strItem == "") retval = -1; - else retval = int.Parse(strItem); - } - - //} - cmd2.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - - public static Boolean UpdateItemSID(int itemIdx, string sid) - { - var cn = getCn(); - cn.Open(); - - int retval = 0; - var cmd2 = new SqlCommand("", cn); - - cmd2.CommandText = string.Format("update Items set sid=@sid where idx=@idx"); - - cmd2.Parameters.Clear(); - cmd2.Parameters.Add(new SqlParameter("idx", itemIdx)); - cmd2.Parameters.Add(new SqlParameter("sid", sid)); - retval = cmd2.ExecuteNonQuery(); - cmd2.Dispose(); - cn.Close(); - cn.Dispose(); - return retval != 0; - } - - public static List getGroupList(string GroupColumn, string table, string where = "", Boolean desc = false, Boolean useColumncover = true) - { - List retval = new List(); - var cn = getCn(); - cn.Open(); - var sql = "select {0} " + - " from {1} " + - " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' "; - - if (table.ToUpper() == "USERS") - sql = "select {0} " + - " from {1} " + - " where isnull({0},'') != '' "; - - - if (where != "") sql += " and " + where; - - sql += " group by {0} " + - " order by {0} "; - if (desc) sql += " desc"; - - if (useColumncover) - sql = string.Format(sql, "[" + GroupColumn + "]", table); - else - sql = string.Format(sql, GroupColumn, table); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - retval.Add(rdr[0].ToString()); - } - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return retval; - } - - public static String getPathKJ(string dept) - { - var cn = getCn(); - cn.Open(); - var sql = "select max(isnull(path_kj,'')) " + - " from UserGroup " + - " where dept = '" + dept + "'"; - - sql = string.Format(sql); - var cmd = new SqlCommand(sql, cn); - var rdr = cmd.ExecuteScalar(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - if (rdr == null) return string.Empty; - else return rdr.ToString(); - } - public static Boolean setPathKJ(string dept, string path) - { - var cn = getCn(); - cn.Open(); - var sql = "update UserGroup set path_kj=@path" + - " where dept = @dept"; - - sql = string.Format(sql); - var cmd = new SqlCommand(sql, cn); - cmd.Parameters.Add(new SqlParameter("path", path)); - cmd.Parameters.Add(new SqlParameter("dept", dept)); - var rdr = cmd.ExecuteNonQuery(); - cmd.Dispose(); - cn.Close(); - cn.Dispose(); - return rdr > 0; - } - - public static List getDateList(string table, string where = "", Boolean desc = false) - { - return getGroupList("pdate", table, where, desc); - } - - public static int UpdateItemIndexbySID() - { - int retval = 0; - var cn1 = getCn(); - cn1.Open(); - - var cn2 = getCn(); - cn2.Open(); - - var sql = "select idx, " + - " isnull(pumname,'') as pumname, " + - " isnull([sid],'') as [sid], " + - " isnull(pumscale,'') as pummodel, " + - " isnull(pumunit,'EA') as pumunit, " + - " isnull(pumprice,0) as pumprice, " + - " isnull(supply,'') as supply, " + - " isnull(supplyidx,-1) as supplyidx" + - " from purchase " + - " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(sid,'') <> '' and " + - " isnull(sid,'') <> '신규'" + - " and isnull(pumidx,-1) = -1 " + - " and len(sid) = 9" + - " and isnull(pumname,'') <> ''"; - - var cmd2 = new SqlCommand("", cn2); - var cmd = new SqlCommand(sql, cn1); - var rdr = cmd.ExecuteReader(); - while (rdr.Read()) - { - var pumname = rdr["pumname"].ToString(); - var pummodel = rdr["pummodel"].ToString(); - var pumunit = rdr["pumunit"].ToString(); - var pumprice = decimal.Parse(rdr["pumprice"].ToString()); - var supply = rdr["supply"].ToString(); - var supplyidx = int.Parse(rdr["supplyidx"].ToString()); - - var sid = rdr["sid"].ToString(); - var idx = int.Parse(rdr["idx"].ToString()); - - //아이템정보에서 이 sid 가 1개 존재한다면 그것에 연결한다. - var sql2 = "select isnull(idx,-1) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'"; - cmd2.CommandText = sql2; - - var itemdata = cmd2.ExecuteScalar(); - if (itemdata != null && itemdata.ToString() != "-1") - { - cmd2.CommandText = "update purchase set pumidx = " + itemdata.ToString() + - " where gcode='" + FCOMMON.info.Login.gcode + "' and idx=" + idx.ToString(); - retval += cmd2.ExecuteNonQuery(); - } - else - { - cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" + - "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)"; - cmd2.Parameters.Clear(); - cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); - cmd2.Parameters.Add(new SqlParameter("cate", "--")); - cmd2.Parameters.Add(new SqlParameter("name", pumname)); - cmd2.Parameters.Add(new SqlParameter("sid", sid)); - cmd2.Parameters.Add(new SqlParameter("model", pummodel)); - cmd2.Parameters.Add(new SqlParameter("scale", 1.0)); - cmd2.Parameters.Add(new SqlParameter("unit", pumunit)); - cmd2.Parameters.Add(new SqlParameter("supply", supply)); - cmd2.Parameters.Add(new SqlParameter("supplyidx", supplyidx)); - cmd2.Parameters.Add(new SqlParameter("price", pumprice)); - cmd2.Parameters.Add(new SqlParameter("wuid", "dev")); - cmd2.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); - retval += cmd2.ExecuteNonQuery(); - } - - - } - cmd2.Dispose(); - cmd.Dispose(); - cn1.Close(); - cn1.Dispose(); - - cn2.Close(); - cn2.Dispose(); - return retval; - } - } + public static partial class DBM + { + public static SqlConnection getCn() + { + string cs = FCOMMON.info.CS; + SqlConnection cn = new SqlConnection(); + cn.ConnectionString = cs; + return cn; + } + + public struct sItemInfo + { + public int idx; + public string sid; + public string model; + public string supply; + public string name; + public string unit; + public float scale; + public string price; + public int supplyidx; + public string project; + public int qty; + } + + public static byte[] getImagByteArray(System.Drawing.Image img) + { + if (img == null || img.Width < 1 || img.Height < 1) return null; + + //이미지가 640보다 크면 조정한다. + if (img.Width > 640) + { + var newrate = (640.0 / img.Width * 1.0); + var newheight = (int)(img.Height * newrate); //높이값 다시 계산 + var newimg = new System.Drawing.Bitmap(640, newheight); + var g = System.Drawing.Graphics.FromImage(newimg); + g.DrawImage(img, new System.Drawing.Rectangle(0, 0, 640, newheight)); + g.Dispose(); + img = (System.Drawing.Image)(newimg.Clone()); + + } + else if (img.Height > 480) + { + var newrate = (480.0 / img.Height * 1.0); + var newwidth = (int)(img.Width * newrate); //높이값 다시 계산 + var newimg = new System.Drawing.Bitmap(newwidth, 480); + var g = System.Drawing.Graphics.FromImage(newimg); + g.DrawImage(img, new System.Drawing.Rectangle(0, 0, newwidth, 480)); + g.Dispose(); + img = (System.Drawing.Image)(newimg.Clone()); + } + + + + System.IO.MemoryStream sm = new System.IO.MemoryStream(); + img.Save(sm, System.Drawing.Imaging.ImageFormat.Jpeg); + var buffer = sm.GetBuffer(); + sm.Dispose(); + return buffer; + } + public static Boolean setImageData(System.Drawing.Bitmap img, string table, string field, int idx) + { + return setImageData((System.Drawing.Image)img, table, field, idx); + } + public static Boolean setImageData(System.Drawing.Image img, string table, string field, int idx) + { + if (img == null || img.Width < 1 || img.Height < 1) return false; + + //이미지가 640보다 크면 조정한다. + if (img.Width > 640) + { + var newrate = (640.0 / img.Width * 1.0); + var newheight = (int)(img.Height * newrate); //높이값 다시 계산 + var newimg = new System.Drawing.Bitmap(640, newheight); + var g = System.Drawing.Graphics.FromImage(newimg); + g.DrawImage(img, new System.Drawing.Rectangle(0, 0, 640, newheight)); + g.Dispose(); + img = (System.Drawing.Image)(newimg.Clone()); + + } + else if (img.Height > 480) + { + var newrate = (480.0 / img.Height * 1.0); + var newwidth = (int)(img.Width * newrate); //높이값 다시 계산 + var newimg = new System.Drawing.Bitmap(newwidth, 480); + var g = System.Drawing.Graphics.FromImage(newimg); + g.DrawImage(img, new System.Drawing.Rectangle(0, 0, newwidth, 480)); + g.Dispose(); + img = (System.Drawing.Image)(newimg.Clone()); + } + + var cn = getCn(); + cn.Open(); + + Boolean retval = false; + string sql = "update " + table + " set " + field + " = @data" + " where idx = @idx"; + var cmd = new SqlCommand(sql, cn); + + System.IO.MemoryStream sm = new System.IO.MemoryStream(); + img.Save(sm, System.Drawing.Imaging.ImageFormat.Jpeg); + var buffer = sm.GetBuffer(); + sm.Dispose(); + + cmd.Parameters.Add(new SqlParameter("idx", idx)); + cmd.Parameters.Add(new SqlParameter("data", buffer)); + try + { + cmd.ExecuteNonQuery(); + retval = true; + } + catch + { + + } + + cn.Close(); + cn.Dispose(); + return retval; + } + + + /// + /// 지정쿼리를 실행합니다. + /// + /// + /// + public static int ExecuteNonQuery(string sql) + { + var cn = getCn(); + cn.Open(); + var cmd = new SqlCommand(sql, cn); + var retval = cmd.ExecuteNonQuery(); + cn.Close(); + cn.Dispose(); + return retval; + } + public static int ExecuteScalarI(string sql) + { + var cn = getCn(); + cn.Open(); + var cmd = new SqlCommand(sql, cn); + var retval = (int)(cmd.ExecuteScalar()); + cn.Close(); + cn.Dispose(); + return retval; + } + public static string ExecuteScalar(string sql) + { + var cn = getCn(); + cn.Open(); + var cmd = new SqlCommand(sql, cn); + var retval = cmd.ExecuteScalar().ToString(); + cn.Close(); + cn.Dispose(); + return retval; + } + public static System.Drawing.Image GetImageData(string table, string field, int idx) + { + var cn = getCn(); + cn.Open(); + + + string sql = "select " + field + " from " + table + " where idx = " + idx.ToString(); + var cmd = new SqlCommand(sql, cn); + var data = cmd.ExecuteScalar() as byte[]; + System.Drawing.Bitmap bmp = null; + if (data != null) + { + System.IO.MemoryStream ms = new System.IO.MemoryStream(data); + bmp = new System.Drawing.Bitmap(ms, true); + ms.Dispose(); + } + cn.Close(); + cn.Dispose(); + return bmp; + } + + public static string GetMaxVersion() + { + try + { + var sql = "select max(prgmVersion) from ProgramUser" + + " where prgmName = 'Amkor K4-EET GroupWare'"; + return ExecuteScalar(sql); + } + catch (Exception ex) + { + return string.Empty; + } + } + + + public static sItemInfo getLastPurchaseInfo(int idx) + { + var cn = getCn(); + cn.Open(); + + var retval = new sItemInfo(); + retval.idx = -1; + + string sql = "select isnull(max(idx),-1) from Purchase where pumidx = " + idx.ToString(); + var cmd = new SqlCommand(sql, cn); + int maxidx = int.Parse(cmd.ExecuteScalar().ToString()); + if (maxidx == -1) return retval; + + cmd.CommandText = "select * from Purchase where idx = " + maxidx.ToString(); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.idx = (int)rdr["idx"]; + if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); + if (rdr["pumscale"] != DBNull.Value) retval.model = rdr["pumscale"].ToString(); + if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); + if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); + else retval.supplyidx = -1; + + if (rdr["pumname"] != DBNull.Value) retval.name = rdr["pumname"].ToString(); + if (rdr["pumunit"] != DBNull.Value) retval.unit = rdr["pumunit"].ToString(); + if (rdr["project"] != DBNull.Value) retval.project = rdr["project"].ToString(); + + if (rdr["pumprice"] != DBNull.Value) retval.price = rdr["pumprice"].ToString(); + else retval.price = "0"; + + if (rdr["pumqty"] != DBNull.Value) retval.qty = int.Parse(rdr["pumqty"].ToString()); + else retval.qty = 0; + + } + + cn.Close(); + cn.Dispose(); + return retval; + } + + public static Dictionary GetUserHolidayJan(string gcode, string uid, string pdate) + { + var cn = getCn(); + cn.Open(); + + var retval = new Dictionary(); + var dt = DateTime.Parse(pdate); + var dtys = dt.Year.ToString("0000") + "-01-01"; + + string sql = "select isnull(cate,'--'), isnull(sum(termdr),0), isnull(sum(term),0), isnull(sum(termdr)-sum(term),0) , isnull(sum(drtime),0),isnull(sum(crtime),0), isnull(sum(drtime)-sum(crtime),0) as JanTime" + + " from Holyday " + + " where gcode=@gcode and uid = @uid and sdate between @sdate and @edate group by cate order by cate"; + + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode; + cmd.Parameters.Add("uid", System.Data.SqlDbType.VarChar).Value = uid; + cmd.Parameters.Add("sdate", System.Data.SqlDbType.VarChar).Value = dtys; + cmd.Parameters.Add("edate", System.Data.SqlDbType.VarChar).Value = pdate; + + + + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Add(rdr[0].ToString(), $"{rdr[1]}|{rdr[2]}|{rdr[3]}|{rdr[4]}|{rdr[5]}|{rdr[6]}"); + } + + cn.Close(); + cn.Dispose(); + return retval; + } + + /// + /// 서플라이정보를 찾습니다. 1개의데이터가 검색된 경우에만 사용 됩니다. + /// + /// + /// + /// + /// + /// + public static Boolean getFindSupply(string nameLike, out int idx, out string nameK, out string nameE) + { + idx = -1; + nameE = ""; + nameK = ""; + + var cn = getCn(); + cn.Open(); + + string sql = "select idx,name,name2 from Customs where (name like '%SEEMAX%' or name2 like '%{0}%')"; + sql = string.Format(sql, nameLike); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + + int cnt = 0; + while (rdr.Read()) + { + idx = (int)rdr["idx"]; + if (rdr["name"] != DBNull.Value) nameK = rdr["name"].ToString(); + if (rdr["name2"] != DBNull.Value) nameE = rdr["name2"].ToString(); + cnt += 1; + } + + cn.Close(); + cn.Dispose(); + return cnt == 1; + } + + /// + /// 프로젝트 주간내역을 추가합니다 + /// + /// + /// + /// + public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message, string rtf) + { + + var cn = getCn(); + cn.Open(); + + string sql = + "insert into ProjectsHistory(pidx,pdate,remark,remark2,wuid,wdate)" + + " values(@pidx,@pdate,@remark,@remark2,@wuid,@wdate)"; + + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("pidx", ProjectIdx)); + cmd.Parameters.Add(new SqlParameter("pdate", pdate)); + cmd.Parameters.Add(new SqlParameter("remark", Message)); + cmd.Parameters.Add(new SqlParameter("remark2", rtf)); + cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + var cnt = cmd.ExecuteNonQuery(); + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return cnt == 1; + } + + public static sItemInfo getItemInfo(int idx) + { + var cn = getCn(); + cn.Open(); + + var retval = new sItemInfo(); + retval.idx = -1; + + string sql = "select * from Items where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString(); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.idx = (int)rdr["idx"]; + if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); + if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString(); + if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); + if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); + + if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString(); + if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString(); + if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString()); + if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString(); + + } + + cn.Close(); + cn.Dispose(); + return retval; + } + public static int addItemInfo(sItemInfo info) + { + int retval = -1; + var cn = getCn(); + cn.Open(); + + string sql = "insert into Items" + + " ([gcode],[cate],[sid],[model],[supply],[supplyidx],[name],[unit],[scale],[price],[wuid],[wdate])" + + " values " + + " (@gcode,@cate,@sid,@model,@supply,@supplyidx,@name,@unit,@scale,@price,@wuid,@wdate)"; + + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("@gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("@cate", "etc")); + cmd.Parameters.Add(new SqlParameter("@sid", info.sid)); + cmd.Parameters.Add(new SqlParameter("@model", info.model)); + cmd.Parameters.Add(new SqlParameter("@supply", info.supply)); + cmd.Parameters.Add(new SqlParameter("@supplyidx", info.supplyidx)); + cmd.Parameters.Add(new SqlParameter("@name", info.name)); + cmd.Parameters.Add(new SqlParameter("@unit", info.unit)); + cmd.Parameters.Add(new SqlParameter("@scale", info.scale)); + cmd.Parameters.Add(new SqlParameter("@price", info.price)); + cmd.Parameters.Add(new SqlParameter("@wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("@wdate", DateTime.Now)); + + var iCnt = cmd.ExecuteNonQuery(); + if (iCnt == 1) + { + cmd.CommandText = "select isnull(idx,-1) from Items where gcode=@gcode and [sid] = @sid"; + cmd.Parameters.Clear(); + cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("sid", info.sid)); + retval = (int)cmd.ExecuteScalar(); + } + + cn.Close(); + cn.Dispose(); + return retval; + } + public static sItemInfo getItemInfo(string sid) + { + var cn = getCn(); + cn.Open(); + + var retval = new sItemInfo(); + retval.idx = -1; + + string sql = "select * from Items where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'"; + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.idx = (int)rdr["idx"]; + if (rdr["sid"] != DBNull.Value) retval.sid = rdr["sid"].ToString(); + if (rdr["model"] != DBNull.Value) retval.model = rdr["model"].ToString(); + if (rdr["supply"] != DBNull.Value) retval.supply = rdr["supply"].ToString(); + if (rdr["supplyidx"] != DBNull.Value) retval.supplyidx = int.Parse(rdr["supplyidx"].ToString()); + + if (rdr["name"] != DBNull.Value) retval.name = rdr["name"].ToString(); + if (rdr["unit"] != DBNull.Value) retval.unit = rdr["unit"].ToString(); + if (rdr["scale"] != DBNull.Value) retval.scale = float.Parse(rdr["scale"].ToString()); + if (rdr["price"] != DBNull.Value) retval.price = rdr["price"].ToString(); + } + + cn.Close(); + cn.Dispose(); + return retval; + } + public static Dictionary getUserList(int baseLevel = 1) + { + string where = "isnull(level,0) >= " + baseLevel.ToString(); + return getTwoColumnList("vGroupUser", "id", "name", where, "name"); + + } + + /// + /// id,name,dispname,dept,email,level,tel,process,grade + /// + /// + /// + public static System.Data.DataTable getUserTable(int baseLevel = 1) + { + var cn = getCn(); + cn.Open(); + + var retval = new sItemInfo(); + retval.idx = -1; + + string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,isnull([dept],'') as dept,isnull(grade,'') as grade,[email],[level],[tel],isnull(processs,'') as process,isnull(indate,'') as indate, isnull(outdate,'') as outdate " + + " from vGroupUser " + + " where gcode='" + FCOMMON.info.Login.gcode + "' and [id] <> 'dev' and isnull(outdate,'') = '' and useUserState = 1 order by [name]"; + var cmd = new SqlCommand(sql, cn); + var da = new SqlDataAdapter(sql, cn); + var ds = new System.Data.DataSet(); + da.Fill(ds); + cn.Close(); + cn.Dispose(); + if (ds.Tables.Count > 0) return ds.Tables[0]; + else return null; + } + + private static Dictionary MakeDataTable(List list) + { + var retval = new Dictionary(); + foreach (var item in list) + retval.Add(item, item); + return retval; + } + private static System.Data.DataTable MakeDataTable(Dictionary list) + { + System.Data.DataTable dt = new System.Data.DataTable(); + dt.Columns.Add("Key"); + dt.Columns.Add("Value"); + dt.Columns.Add("KeyValue"); + + foreach (var item in list) + { + dt.Rows.Add(new string[] { item.Key, item.Value, string.Format("[{0}] {1}", item.Key, item.Value) }); + } + dt.AcceptChanges(); + return dt; + } + + public static Dictionary getProjectList(string StateCode = "") + { + string where = "status = '{0}'"; + if (StateCode != "") where = string.Format(where, StateCode); + else where = string.Empty; + + return getTwoColumnList("Projects", "idx", "name", where, "status,name"); + } + public static System.Data.DataTable getProjectData(string StateCode = "") + { + var list = getProjectList(StateCode); + return MakeDataTable(list); + } + public static Dictionary getCodeList(string GroupCode = "99") + { + string where = "Grp = '{0}'"; + where = string.Format(where, GroupCode); + return getTwoColumnList("Common", "code", "memo", where, "code"); + } + public static string getCodeSavlue(string GroupCode, string code) + { + var cn = getCn(); + cn.Open(); + var sql = "select isnull(SValue,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'"; + + sql = string.Format(sql, GroupCode, code); + var cmd = new SqlCommand(sql, cn); + var data = cmd.ExecuteScalar(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return data.ToString(); + } + + public struct sCodeData + { + public string code; + public string title; + public string svalue; + public string grp; + } + public static sCodeData getCodeBySvalue(string GroupCode, string svalue) + { + var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and svalue = '{1}'"; + + sql = string.Format(sql, GroupCode, svalue); + var cmd = new SqlCommand(sql, cn); + var da = cmd.ExecuteReader(); + while (da.Read()) + { + retval.code = da[0].ToString(); + retval.title = da[1].ToString(); + } + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + retval.grp = GroupCode; + retval.svalue = svalue; + return retval; + } + public static sCodeData getCodeByMemo(string GroupCode, string memo) + { + var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and memo = '{1}'"; + + sql = string.Format(sql, GroupCode, memo); + var cmd = new SqlCommand(sql, cn); + var da = cmd.ExecuteReader(); + while (da.Read()) + { + retval.code = da[0].ToString(); + retval.title = da[1].ToString(); + } + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + retval.grp = GroupCode; + retval.svalue = memo; + return retval; + } + + public static Boolean InsertLog(string cate, string remark, string pdate = "") + { + if (String.IsNullOrEmpty(pdate)) pdate = DateTime.Now.ToShortDateString(); + + try + { + var cn = getCn(); + cn.Open(); + var sql = "insert into EETGW_Log(gcode,pdate,cate,remark,wuid,wdate)" + + " values(@gcode,@pdate,@cate,@remark,@wuid,@wdate)"; + + //sql = string.Format(sql, info.Login.gcode, memo); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("pdate", pdate)); + cmd.Parameters.Add(new SqlParameter("cate", cate)); + cmd.Parameters.Add(new SqlParameter("remark", remark)); + cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + var da = cmd.ExecuteNonQuery(); + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return da > 0; + } + + catch { } + return false; + } + + + public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "") + { + + var cn = getCn(); + cn.Open(); + var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" + + " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)"; + + sql = string.Format(sql, GroupCode, memo); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("grp", GroupCode)); + cmd.Parameters.Add(new SqlParameter("code", code)); + cmd.Parameters.Add(new SqlParameter("memo", memo)); + cmd.Parameters.Add(new SqlParameter("svalue", svalue)); + cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + var da = cmd.ExecuteNonQuery(); + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return da > 0; + } + + public static sCodeData getCodeByCode(string GroupCode, string code) + { + var retval = new sCodeData(); + retval.code = string.Empty; + retval.title = string.Empty; + retval.svalue = string.Empty; + retval.grp = string.Empty; + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo,'')" + + " from Common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'"; + + sql = string.Format(sql, GroupCode, code); + var cmd = new SqlCommand(sql, cn); + var da = cmd.ExecuteReader(); + while (da.Read()) + { + retval.code = da[0].ToString(); + retval.title = da[1].ToString(); + } + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + retval.grp = GroupCode; + retval.svalue = code; + return retval; + } + + /// + /// 지정된 프로젝트의 마지막 업무일지 데이터를 반환함 + /// + /// + /// + public static System.Data.DataTable getLastJobReportData(string uid, int projectIdx) + { + var cn = getCn(); + cn.Open(); + var sql = "select top 1 * from JobReport" + + " where gcode ='" + FCOMMON.info.Login.gcode + "' and isnull(pidx,-1)=" + projectIdx.ToString() + + " and uid ='" + uid + "'" + + " order by pdate desc, idx desc"; + var da = new SqlDataAdapter(sql, cn); + var ds = new System.Data.DataSet(); + da.Fill(ds); + cn.Close(); + if (ds.Tables.Count > 0) return ds.Tables[0]; + else return null; + } + public static System.Data.DataTable getLastJobReportDatabyProjectName(string uid, string prjName) + { + var cn = getCn(); + cn.Open(); + var sql = "select top 1 * from JobReport" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(projectName,'') like '" + prjName + "'" + + " and uid ='" + uid + "'" + + " order by pdate desc, idx desc"; + var da = new SqlDataAdapter(sql, cn); + var ds = new System.Data.DataSet(); + da.Fill(ds); + cn.Close(); + if (ds.Tables.Count > 0) return ds.Tables[0]; + else return null; + } + public static System.Data.DataTable getLastJobReportData(string uid, string type) + { + var cn = getCn(); + cn.Open(); + var sql = "select top 1 * from JobReport" + + " where gcode = '" + FCOMMON.info.Login.gcode + "' and isnull([type],'')='" + type + "'" + + " and uid ='" + uid + "'" + + " order by pdate desc, idx desc"; + var da = new SqlDataAdapter(sql, cn); + var ds = new System.Data.DataSet(); + da.Fill(ds); + cn.Close(); + if (ds.Tables.Count > 0) return ds.Tables[0]; + else return null; + } + + public static System.Data.DataTable getProcessList() + { + + System.Data.DataTable retval = new System.Data.DataTable(); + retval.Columns.Add("Code"); + retval.Columns.Add("Value"); + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(processs,'') as process" + + " from Users" + + " where processs is not null and gcode='{0}'" + + " group by processs" + + " order by process"; + + sql = string.Format(sql, FCOMMON.info.Login.gcode); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + var cnt = 0; + while (rdr.Read()) + { + retval.Rows.Add(new string[] { cnt.ToString(), rdr[0].ToString() }); + cnt += 1; + } + rdr.Close(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + + + + public static System.Data.DataTable getUserProjectList(string userName) + { + + System.Data.DataTable retval = new System.Data.DataTable(); + retval.Columns.Add("Code"); + retval.Columns.Add("Value"); + retval.Columns.Add("NameOnly"); + + var cn = getCn(); + cn.Open(); + var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'') from Projects" + + " where gcode='{0}'" + + " and (isnull(userManager,'') like '%{1}%'" + + " or isnull(userMain,'') like '%{1}%'" + + " or isnull(usersub,'') like '%{1}%')" + + " and status not in ('보류', '취소', '완료(보고)')" + + " order by status desc,pdate desc,name"; + //" order by pdate desc,name"; + sql = string.Format(sql, FCOMMON.info.Login.gcode, userName); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Rows.Add(new string[] { + rdr[0].ToString(), + rdr[1].ToString(), + rdr[2].ToString() + }); + } + rdr.Close(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + + + public static System.Data.DataTable getCodeTable(string GroupCode = "99", string sort = "memo") + { + + System.Data.DataTable retval = new System.Data.DataTable(); + retval.Columns.Add("Code"); + retval.Columns.Add("Value"); + retval.Columns.Add("SValue"); + + var cn = getCn(); + cn.Open(); + var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,'')" + + " from common" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" + + " and isnull(code,'') <> ''" + + " order by isnull(" + sort + ",'')"; + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString() }); + } + rdr.Close(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + public static Dictionary getTwoColumnList(string table, string col1, string col2, string where = "", string order = "") + { + Dictionary retval = new Dictionary(); + var cn = getCn(); + cn.Open(); + var sql = "select isnull({1},''),isnull({2},'')" + + " from {0} " + + " where gcode = '" + FCOMMON.info.Login.gcode + "' "; + if (where != "") sql += " and " + where; + if (order != "") sql += " order by " + order; + sql = string.Format(sql, table, col1, col2); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Add(rdr[0].ToString(), rdr[1].ToString()); + } + rdr.Close(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + public static List getPlaceList(string gcode) + { + var retval = new List(); + var cn = getCn(); + cn.Open(); + var sql = "select isnull(place,'')" + + " from Inventory " + + " where gcode = '{0}'" + + " order by place"; + sql = string.Format(sql, gcode); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Add(rdr[0].ToString()); + } + rdr.Close(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + public static Dictionary getGroupTable(string GroupColumn, string table, string where = "", Boolean desc = false) + { + var list = getGroupList(GroupColumn, table, where, desc); + return MakeDataTable(list); + } + + /// + /// 데이터중 첫번째 자료를 반환 합니다. + /// + /// + /// + /// + /// + /// + public static String getFirstValue(string column, string table, string where = "", string order = "") + { + string retval = string.Empty; + var cn = getCn(); + cn.Open(); + var sql = "select {0} " + + " from {1} " + + " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' "; + + if (where != "") sql += " and " + where; + if (order != "") sql += " order by " + order; + + sql = string.Format(sql, "[" + column + "]", table); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + if (rdr[0] != null) retval = rdr[0].ToString(); + } + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + + + /// + /// 지정된 사용자/월의 전체 근무시간 초과시간을 반환함 + /// + /// 사용자번호 + /// 지정월(2019-05) + /// 근무시간 + /// 최대근무시간(근무일수*8) + /// 초과근무시간 + public static void getWorkTime(string uid, string yymm, out float work, out int total, out float ot) + { + work = 0; + total = 0; + ot = 0; + string retval = string.Empty; + var cn = getCn(); + + try + { + + cn.Open(); + var sql = "select isnull(sum(hrs),0) as hrs,isnull(sum(ot),0) as ot,dbo.getWorkDayCount('{1}') as workday" + + " from JobReport" + + " where gcode='" + FCOMMON.info.Login.gcode + "' and uid = '{0}' and substring(pdate,1,7) = '{1}'"; + + sql = string.Format(sql, uid, yymm); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + work = float.Parse(rdr[0].ToString()); + ot = float.Parse(rdr[1].ToString()); + total = int.Parse(rdr[2].ToString()) * 8; + } + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + } + catch + { + work = 0; + total = 0; + ot = 0; + } + finally + { + if (cn != null) cn.Dispose(); + } + } + + + public static int addItem(string pumname, string sid, string model, decimal price, string supply, int supplyidx = -1, byte[] pic = null) + { + + var cn = getCn(); + cn.Open(); + + int retval = -1; + var cmd2 = new SqlCommand("", cn); + + cmd2.CommandText = string.Format("select count(*) from Items " + + " where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''")); + var cnt = int.Parse(cmd2.ExecuteScalar().ToString()); + if (cnt == 0) + { + DateTime wdate = DateTime.Now; + + if (pic == null) + { + cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" + + "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)"; + } + else + { + cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,image,wuid,wdate)" + + "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@image,@wuid,@wdate)"; + } + + cmd2.Parameters.Clear(); + cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd2.Parameters.Add(new SqlParameter("cate", "--")); + cmd2.Parameters.Add(new SqlParameter("name", pumname.Trim())); + cmd2.Parameters.Add(new SqlParameter("sid", sid.Trim())); + cmd2.Parameters.Add(new SqlParameter("model", model.Trim())); + cmd2.Parameters.Add(new SqlParameter("scale", 1.0)); + cmd2.Parameters.Add(new SqlParameter("unit", "EA")); + cmd2.Parameters.Add(new SqlParameter("supply", supply)); + if (pic != null) cmd2.Parameters.Add(new SqlParameter("image", pic)); + cmd2.Parameters.Add(new SqlParameter("supplyidx", supplyidx)); + cmd2.Parameters.Add(new SqlParameter("price", price)); + cmd2.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd2.Parameters.Add(new SqlParameter("wdate", wdate)); + retval += cmd2.ExecuteNonQuery(); + + //추가된 데이터를 찾아서 다시 검색한다. + //if (retval == 0) + //{ + // cmd2.CommandText = "select idx from Items where gcode=@gcode and name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate"; + // retval = int.Parse(cmd2.ExecuteScalar().ToString()); + //} + //else retval = -1; + } + + //{ + cmd2.CommandText = string.Format("select min(idx) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''")); + var itemdata = cmd2.ExecuteScalar(); + if (itemdata == DBNull.Value || itemdata == null) + { + retval = -1; + } + else + { + var strItem = itemdata.ToString(); + if (strItem == "") retval = -1; + else retval = int.Parse(strItem); + } + + //} + cmd2.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + + public static Boolean UpdateItemSID(int itemIdx, string sid) + { + var cn = getCn(); + cn.Open(); + + int retval = 0; + var cmd2 = new SqlCommand("", cn); + + cmd2.CommandText = string.Format("update Items set sid=@sid where idx=@idx"); + + cmd2.Parameters.Clear(); + cmd2.Parameters.Add(new SqlParameter("idx", itemIdx)); + cmd2.Parameters.Add(new SqlParameter("sid", sid)); + retval = cmd2.ExecuteNonQuery(); + cmd2.Dispose(); + cn.Close(); + cn.Dispose(); + return retval != 0; + } + + public static List getGroupList(string GroupColumn, string table, string where = "", Boolean desc = false, Boolean useColumncover = true) + { + List retval = new List(); + var cn = getCn(); + cn.Open(); + var sql = "select {0} " + + " from {1} " + + " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' "; + + if (table.ToUpper() == "USERS") + sql = "select {0} " + + " from {1} " + + " where isnull({0},'') != '' "; + + + if (where != "") sql += " and " + where; + + sql += " group by {0} " + + " order by {0} "; + if (desc) sql += " desc"; + + if (useColumncover) + sql = string.Format(sql, "[" + GroupColumn + "]", table); + else + sql = string.Format(sql, GroupColumn, table); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + retval.Add(rdr[0].ToString()); + } + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return retval; + } + + public static String getPathKJ(string dept) + { + var cn = getCn(); + cn.Open(); + var sql = "select max(isnull(path_kj,'')) " + + " from UserGroup " + + " where dept = '" + dept + "'"; + + sql = string.Format(sql); + var cmd = new SqlCommand(sql, cn); + var rdr = cmd.ExecuteScalar(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + if (rdr == null) return string.Empty; + else return rdr.ToString(); + } + public static Boolean setPathKJ(string dept, string path) + { + var cn = getCn(); + cn.Open(); + var sql = "update UserGroup set path_kj=@path" + + " where dept = @dept"; + + sql = string.Format(sql); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("path", path)); + cmd.Parameters.Add(new SqlParameter("dept", dept)); + var rdr = cmd.ExecuteNonQuery(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return rdr > 0; + } + + public static List getDateList(string table, string where = "", Boolean desc = false) + { + return getGroupList("pdate", table, where, desc); + } + + public static int UpdateItemIndexbySID() + { + int retval = 0; + var cn1 = getCn(); + cn1.Open(); + + var cn2 = getCn(); + cn2.Open(); + + var sql = "select idx, " + + " isnull(pumname,'') as pumname, " + + " isnull([sid],'') as [sid], " + + " isnull(pumscale,'') as pummodel, " + + " isnull(pumunit,'EA') as pumunit, " + + " isnull(pumprice,0) as pumprice, " + + " isnull(supply,'') as supply, " + + " isnull(supplyidx,-1) as supplyidx" + + " from purchase " + + " where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(sid,'') <> '' and " + + " isnull(sid,'') <> '신규'" + + " and isnull(pumidx,-1) = -1 " + + " and len(sid) = 9" + + " and isnull(pumname,'') <> ''"; + + var cmd2 = new SqlCommand("", cn2); + var cmd = new SqlCommand(sql, cn1); + var rdr = cmd.ExecuteReader(); + while (rdr.Read()) + { + var pumname = rdr["pumname"].ToString(); + var pummodel = rdr["pummodel"].ToString(); + var pumunit = rdr["pumunit"].ToString(); + var pumprice = decimal.Parse(rdr["pumprice"].ToString()); + var supply = rdr["supply"].ToString(); + var supplyidx = int.Parse(rdr["supplyidx"].ToString()); + + var sid = rdr["sid"].ToString(); + var idx = int.Parse(rdr["idx"].ToString()); + + //아이템정보에서 이 sid 가 1개 존재한다면 그것에 연결한다. + var sql2 = "select isnull(idx,-1) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'"; + cmd2.CommandText = sql2; + + var itemdata = cmd2.ExecuteScalar(); + if (itemdata != null && itemdata.ToString() != "-1") + { + cmd2.CommandText = "update purchase set pumidx = " + itemdata.ToString() + + " where gcode='" + FCOMMON.info.Login.gcode + "' and idx=" + idx.ToString(); + retval += cmd2.ExecuteNonQuery(); + } + else + { + cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" + + "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)"; + cmd2.Parameters.Clear(); + cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd2.Parameters.Add(new SqlParameter("cate", "--")); + cmd2.Parameters.Add(new SqlParameter("name", pumname)); + cmd2.Parameters.Add(new SqlParameter("sid", sid)); + cmd2.Parameters.Add(new SqlParameter("model", pummodel)); + cmd2.Parameters.Add(new SqlParameter("scale", 1.0)); + cmd2.Parameters.Add(new SqlParameter("unit", pumunit)); + cmd2.Parameters.Add(new SqlParameter("supply", supply)); + cmd2.Parameters.Add(new SqlParameter("supplyidx", supplyidx)); + cmd2.Parameters.Add(new SqlParameter("price", pumprice)); + cmd2.Parameters.Add(new SqlParameter("wuid", "dev")); + cmd2.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + retval += cmd2.ExecuteNonQuery(); + } + + + } + cmd2.Dispose(); + cmd.Dispose(); + cn1.Close(); + cn1.Dispose(); + + cn2.Close(); + cn2.Dispose(); + return retval; + } + } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 7d2a68a..0b4669a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,34 +30,34 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -132,8 +132,8 @@ this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.label1 = new System.Windows.Forms.Label(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -644,7 +644,8 @@ this.cmbSort.Items.AddRange(new object[] { "등록일", "완료일", - "S/C"}); + "S/C", + "SID+등록일"}); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(90, 37); // @@ -784,18 +785,6 @@ this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // - // 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, 629); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1226, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -839,7 +828,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType39; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -848,7 +837,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType40; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -856,27 +845,27 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType41; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType42; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType43; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType44; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; @@ -884,182 +873,182 @@ 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; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType45; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType46; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType47; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType48; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + numberCellType17.DecimalPlaces = 0; + numberCellType17.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType17.MaximumValue = 2147483647D; + numberCellType17.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType49; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType50; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType50; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType50; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2; + numberCellType18.DecimalPlaces = 0; + numberCellType18.NegativeRed = true; + numberCellType18.NullDisplay = "--"; + numberCellType18.Separator = ","; + numberCellType18.ShowSeparator = true; + numberCellType18.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType51; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - numberCellType3.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; + numberCellType19.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가($)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.MaximumValue = 9999999999999.99D; - numberCellType4.MinimumValue = -9999999999999.99D; - numberCellType4.NegativeRed = true; - numberCellType4.NullDisplay = "--"; - numberCellType4.Separator = ","; - numberCellType4.ShowSeparator = true; - numberCellType4.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + numberCellType20.DecimalPlaces = 0; + numberCellType20.MaximumValue = 9999999999999.99D; + numberCellType20.MinimumValue = -9999999999999.99D; + numberCellType20.NegativeRed = true; + numberCellType20.NullDisplay = "--"; + numberCellType20.Separator = ","; + numberCellType20.ShowSeparator = true; + numberCellType20.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5; + numberCellType21.DecimalPlaces = 0; + numberCellType21.MaximumValue = 9999999999999.99D; + numberCellType21.MinimumValue = -9999999999999.99D; + numberCellType21.NegativeRed = true; + numberCellType21.NullDisplay = "--"; + numberCellType21.Separator = ","; + numberCellType21.ShowSeparator = true; + numberCellType21.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType21; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType52; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType6; + numberCellType22.DecimalPlaces = 0; + numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType22.MaximumValue = 2147483647D; + numberCellType22.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType22; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType53; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(22).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType7; + numberCellType23.DecimalPlaces = 0; + numberCellType23.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType23.MaximumValue = 2147483647D; + numberCellType23.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType23; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType54; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType55; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType56; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; - numberCellType8.NegativeRed = true; - numberCellType8.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType8; + numberCellType24.NegativeRed = true; + numberCellType24.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType24; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType57; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(28).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType3; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel"; @@ -1070,6 +1059,18 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; 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, 629); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1226, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 3b92c71..1782312 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -203,10 +203,25 @@ namespace FEQ0000 // else cmd.CommandText += " and (state < '04' or state > '07')"; - if (cmbSort.SelectedIndex == 1) dateField = "edate"; - else if (cmbSort.SelectedIndex == 2) dateField = "sc"; - - cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC"; + if (cmbSort.SelectedIndex == 1) + { + dateField = "edate"; + cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC"; + } + else if (cmbSort.SelectedIndex == 2) + { + dateField = "sc"; + cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC"; + } + else if (cmbSort.SelectedIndex == 3) + { + cmd.CommandText += " ORDER BY state , (case sid when '' then '0' when '신규' then '0' when '신규품목' then '0' else '1' end) desc, pdate desc, idx DESC"; + } + else + { + cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC"; + } + cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text)); cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@ed", dtED.Text)); @@ -507,7 +522,7 @@ namespace FEQ0000 var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; } - else + else { var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?\n저장 버튼을 눌러야 최종 삭제 됩니다"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 86ba28f..5da41f4 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -264,6 +264,20 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= @@ -303,20 +317,6 @@ oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA Ow== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX - EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl - 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR - BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT - Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz - tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV - iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i - DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA - AAAASUVORK5CYII= @@ -409,14 +409,14 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVFhH7ZDLSsNAFIbzIq59BJ9Am6SlN/Al+hZFkKQX - C+60Yqs7dSkobrzbmURXuihCpdilVGhRsFpxzBmSUsPYNJ3QiMwHP5OZ8zP9OpLg3xPREOGJmsNvqYJ5 - FNEvZ+G+hSVzJl0yD+Gc1feTgSAP7Zd3Uqk1+3HN6M5n0VyscNGpomYfznkITNCBSubxE6z2EReBC8KL - RfOYrkEQuCAQ9F1CkIfQBDdPWyRRNEjlrGWfsAlNMLli0h6sowhNEF4O5Kp/9QXHRQiygPlwRgHzqQsC - jpxXF+ZCkIUj59WFuRBk4ch5dWEuBFk4cl5dmAtBN47YcH4DZlMX9IMQ5EUI8iIEefkhyJvF1RuydvxI - v2GFvbszSQaCB40vruze9Uhmq04vzWzXyZ61Z/X8ZCAYXTaeN3CXWfKTndsevRRkWXM/KVs+SuG8TQVl - HakgCZdPGvcfhB9g9cYNyCkaUqggL3KulkqWrl7LuEP27z/JOuqQhLVXdJy0K+Gjaigdz10/yNmTj1gR - N0DaHglCRpK+ARAkpJsozCLRAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGRSURBVFhH7ZDdSgJBGIa9kY67hK6gdFXyB7oJr6IIYv1L + 6KyMrM6qw6DoRPp1xq2jOpDAkDwMA6Ugy2jyHXbFZHJdZ3Ej5oGX2ZnvZXwcn+Lf49cJk0kwRd9iGePE + n7ycxn1zy8ZUPGcc41zUd5KeoAyNl3dWKNU683q5NbtEZsKZi2aB1Do4l8E1QQsumaZPWM0jKVwXxIuF + 0pSvbuC6IHD7LiUog2eCW6d1FsmWWeGsbp6I8UwwumrwHtZheCaIl4Pc9l99wVFRgiIw788wMJ+4ILDk + 7LqYK0ERlpxdF3MlKMKSs+tirgRFWHJ2XcyV4CCWWH9+A7OJCzpBCcqiBGVRgrL8EJTNwtoNWy8+8m+s + 2A92xklP8Kj6JZX9uzZL7FT4pYndCjvo7kU9J+kJhlbKz5u0JSw5yd5tm18KWdHcSfJdHy1z3uCCgSQJ + QhKXj5vBP4gfEPVGDeQ0nWhcUJZAqhSL5q5e87TJDu8/2QZpskh3ryVp1Kx4T1An8fnU9UNgsfgRztIq + pM2RwmN8vm/2naSYGr2SOAAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index a7a8715..1d30c42 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -9,709 +9,736 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class fJobReport_Add : Form - { - dsPRJ.JobReportRow dr; - Boolean copyMOde = false; - Boolean bInit = false; - bool ReadMode = false; - public fJobReport_Add(dsPRJ.JobReportRow dr_, Boolean copy = false, Boolean read = false) - { - InitializeComponent(); - dr = dr_; - ReadMode = read; - this.KeyPreview = true; - this.StartPosition = FormStartPosition.CenterScreen; - this.KeyDown += (s1, e1) => - { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - foreach (Control ctl in this.panel1.Controls) - { - if (ctl.GetType() == typeof(TextBox) || ctl.GetType() == typeof(ComboBox)) - { - ctl.KeyDown += ctl_KeyDown; - } - } - copyMOde = copy; - this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged; - this.grpkisul.Visible = getKisulInput; - } - - void tbProject_SelectedIndexChanged(object sender, EventArgs e) - { - if (bInit == false || this.tbProject.SelectedIndex < 0) return; - var data = this.tbProject.SelectedValue; - if (data == null) return; - if (data.GetType() == typeof(DataRowView)) - { - var drv = data as DataRowView; - var idx = int.Parse(drv["Code"].ToString()); - tbProjectIndex.Text = idx.ToString(); - tbProject.Tag = tbProject.Text; - Console.WriteLine(string.Format("Project Select #1 {0}:{1}", idx, tbProject.Text)); - } - else - { - var idx = int.Parse(data.ToString()); - tbProjectIndex.Text = idx.ToString(); - tbProject.Tag = tbProject.Text; - Console.WriteLine(string.Format("Project Select #2 {0}:{1}", idx, tbProject.Text)); - } - - } - private bool getKisulInput - { - get - { - return FCOMMON.Util.getBit( - FCOMMON.info.Login.gpermission, - (int)FCOMMON.eGroupPermission.jobreport_kisul); - } - } - private void fJobReport_Add_Load(object sender, EventArgs e) - { - //사용자목록 - this.bs.DataSource = dr; - this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm.ss"; - this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm.ss"; - - //해당 사용자에 걸린 프로젝트 목록 가져오기 - var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK); - this.tbProject.DataSource = userProject; - this.tbProject.ValueMember = "Code"; - this.tbProject.DisplayMember = "NameOnly"; - - //상태 - var stateList = FCOMMON.DBM.getCodeTable("12"); - this.cmbState.DisplayMember = "Value"; - this.cmbState.ValueMember = "Value"; - this.cmbState.DataSource = stateList; - this.cmbState.Text = dr.status; - - //요청부서 - var dt_request = FCOMMON.DBM.getCodeTable("13"); - this.cmbRequest.DisplayMember = "Value"; - this.cmbRequest.ValueMember = "Value"; - this.cmbRequest.DataSource = dt_request; - - //패키지 - var dt_package = FCOMMON.DBM.getCodeTable("14"); - this.cmbPackage.DisplayMember = "Value"; - this.cmbPackage.ValueMember = "Value"; - this.cmbPackage.DataSource = dt_package; - - //타입 - var dt_type = FCOMMON.DBM.getCodeTable("15"); - this.cmbType.DisplayMember = "Value"; - this.cmbType.ValueMember = "Value"; - this.cmbType.DataSource = dt_type; - - //공정 - var dt_process = FCOMMON.DBM.getCodeTable("16"); - this.cmbProcess.DisplayMember = "Value"; - this.cmbProcess.ValueMember = "Value"; - this.cmbProcess.DataSource = dt_process; - - if (getKisulInput) - { - //기술분류 - var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50"); - this.cmb_kisuldiv.DisplayMember = "Value"; - this.cmb_kisuldiv.ValueMember = "Value"; - this.cmb_kisuldiv.DataSource = dt_kisuldiv; - - //기술레벨 - var dt_kisullv = FCOMMON.DBM.getCodeTable("51"); - this.cmb_kisullv.DisplayMember = "Value"; - this.cmb_kisullv.ValueMember = "Value"; - this.cmb_kisullv.DataSource = dt_kisullv; - } - - //담당자목록 - - var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); - this.cmbUser.DisplayMember = "dispName"; - this.cmbUser.ValueMember = "id"; - this.cmbUser.DataSource = dt_users; - if (FCOMMON.info.Login.level < 5) cmbUser.Enabled = false; - - // tbWW.Text = dr.ww; - dtPdate.Value = DateTime.Parse(dr.pdate); //일자선택 - cmbUser.SelectedValue = dr.uid; - tbProject.Text = dr.projectName; - cmbRequest.SelectedValue = dr.requestpart; - cmbPackage.SelectedValue = dr.package; - cmbType.SelectedValue = dr.type; - cmbProcess.SelectedValue = dr.process; - tbTag.Text = dr.tag; - - - if (dr.ot > 0) - { - if (dr.ot2 == 0) - { - lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다"; - lbOt2.ForeColor = Color.Blue; - lbotReason.Visible = false; - } - else - { - lbOt2.Text = $"승인시간:{dr.ot2}"; - lbotReason.Text = $"사유:{dr.otReason}"; - } - - } - else - { - lbOt2.Visible = false; - lbotReason.Visible = false; - } - - - if (getKisulInput) - { - cmb_kisuldiv.Text = dr.kisuldiv; - cmb_kisullv.Text = dr.kisullv; - textBox1.Text = dr.kisulamt.ToString(); - } - - if (dr.IsotStartNull()) dateTimePicker1.Value = DateTime.Now; - else dateTimePicker1.Value = dr.otStart; - if (dr.IsotEndNull()) dateTimePicker2.Value = DateTime.Now; - else dateTimePicker2.Value = dr.otEnd; - - //if (cmbRequest.Text == "") cmbRequest.Text = "EE1"; - if (cmbPackage.Text == "") cmbPackage.Text = "Common"; - - if (dr.ot != 0) - { - dateTimePicker1.Enabled = true; - dateTimePicker2.Enabled = true; - } - else - { - dateTimePicker1.Enabled = false; - dateTimePicker2.Enabled = false; - } - - //프로젝트 번호 확인(프로젝트번호가 바뀌면 데이터를 업데이트 해준다) - if (dr.IspidxNull()) - { - tbProjectIndex.Tag = -1; - tbProjectIndex.Text = "-1"; - } - else - { - tbProjectIndex.Tag = dr.pidx; - tbProjectIndex.Text = dr.pidx.ToString(); - } - - //신규일때만 사용가능 함 - if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) chkAutoAdd.Enabled = true; - else chkAutoAdd.Enabled = false; - - - if (string.IsNullOrEmpty(dr.description2)) - { - this.richTextBoxEx1.Text = dr.description; - } - else - { - try - { - this.richTextBoxEx1.Rtf = dr.description2; - } - catch - { - this.richTextBoxEx1.Text = dr.description; - } - } - - this.Show(); - Application.DoEvents(); - - if (dr.ot > 0 && dr.ot2 > 0) - { - tbOt.Enabled = false; - FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다"); - } - - //if (this.richTextBoxEx1.Text.Trim() != "") - //{ - // this.richTextBoxEx1.Focus(); - //} - //else - //{ - cmbRequest.Focus(); - // tbProject.SelectAll(); - //} - tbProject.Tag = tbProject.Text; - - // if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description; - - //editor - // ed = new editform.editor(); - //ed.AllowDiscAccess = true; - //ed.WindowTitle = "Quick Edit"; - //ed.StartingFont = new Font("Courier New", 12.0f, FontStyle.Regular); - - //ed.DisplayEditForm(this.panel1); - //ed.AllowRtf = true; - if (ReadMode) - { - panel1.Enabled = false; - this.Text += "(읽기전용)"; - - } - - //신규데이터라면 양식을 처리한다. - if (copyMOde==false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) - { - //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. - var db = new EEEntities(); - var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J0").FirstOrDefault(); - if (dr0 != null) - { - richTextBoxEx1.Rtf = dr0.body; - } - db.Dispose(); - } - - - bInit = true; - } - // editform.editor ed; - void ctl_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - Control ctl = sender as Control; - string nm = ctl.Name.ToLower(); - string search = ctl.Text.Trim(); - - Console.WriteLine("inner keydown " + nm + ":" + search); - - switch (nm) - { - //case "cmbrequest": - - // //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다. - // var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc"); - // if (lastprocess != "") cbProcess.Text = lastprocess; - // tbSID.Focus(); - // break; - case "tbdescription": - if (e.Control) - { - btSave.Focus(); - } - break; - case "tbproject": - if (search != "") - { - var f = new fLovProject("%" + search + "%"); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - this.tbProject.Text = f.Title; - this.tbProject.Tag = f.Title; - this.tbProjectIndex.Text = f.Index.ToString(); - tbHrs.Focus(); - tbHrs.SelectAll(); - - if (tbProjectIndex.Tag.ToString() != f.Index.ToString() || f.Index == -1) - { - //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다. - var uid = cmbUser.SelectedValue.ToString(); - DataTable lastDt = null; - - if (f.Index != -1) lastDt = FCOMMON.DBM.getLastJobReportData(uid, f.Index); - else lastDt = FCOMMON.DBM.getLastJobReportDatabyProjectName(uid, f.Title); - - if (lastDt != null && lastDt.Rows.Count > 0) - { - var predr = lastDt.Rows[0]; - - if (predr["requestpart"] != DBNull.Value) - this.cmbRequest.Text = predr["requestpart"].ToString(); //190506 - - if (predr["package"] != DBNull.Value) - this.cmbPackage.Text = predr["package"].ToString(); //190506 - - if (predr["type"] != DBNull.Value) - this.cmbType.Text = predr["type"].ToString(); //190506 - - if (predr["process"] != DBNull.Value) - cmbProcess.Text = predr["process"].ToString(); //190506 - } - } - } - else - { - //이름만 사용한다. - tbProjectIndex.Text = "-1"; - cmbRequest.Focus(); - } - } - else - { - FCOMMON.Util.MsgE("프로젝트 혹은 아이템이름은 반드시 입력되어야 합니다."); - var tb = sender as ComboBox; - tb.SelectAll(); - tb.Focus(); - } - break; - - default: - SendKeys.Send("{TAB}"); - break; - } - } - } - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString()); - if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - dtPdate.Value = f.dtSelect; - } - - private void button1_Click(object sender, EventArgs e) - { - this.Invalidate(); - if (tbProject.Text.Trim() == "") - { - FCOMMON.Util.MsgE("프로젝트(아이템) 명칭이 없습니다."); - tbProject.Focus(); - return; - } - if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true) - { - FCOMMON.Util.MsgE("진행 내용이 없습니다."); - this.richTextBoxEx1.Focus(); - return; - } - float hour = Single.Parse(tbHrs.Text) + Single.Parse(tbOt.Text); - if (hour == 0) - { - FCOMMON.Util.MsgE("근무시간/초과시간이 입력되지 않았습니다."); - if (tbHrs.Enabled) tbHrs.Focus(); - else tbOt.Focus(); - return; - } - - if (cmbType.Text.Trim() == "") - { - FCOMMON.Util.MsgE("업무형태를 선택하세요"); - cmbType.Focus(); - return; - } - if (cmbProcess.Text.Trim() == "") - { - FCOMMON.Util.MsgE("공정을 선택하세요"); - cmbProcess.Focus(); - return; - } - if (cmbUser.SelectedIndex < 0) - { - FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다."); - cmbUser.Focus(); - return; - } - - if (tbProject.Tag.ToString() != tbProject.Text && tbProjectIndex.Text != "" && tbProjectIndex.Text != "-1") - { - FCOMMON.Util.MsgE("프로젝트가 선택되었으나 이름이 임의 수정되어 프로젝트 연결을 해제 합니다\n\n" + - "잘못된 프로젝트명은 프로젝트 관리화면에서 변경하시기 바랍니다.\n\n" + - "원본 : " + tbProject.Tag.ToString() + "\n" + - "현재 : " + tbProject.Text); - tbProjectIndex.Text = "-1"; - } - - ///휴일체크 - var taQ = new dsQueryTableAdapters.QueriesTableAdapter(); - var freeday = taQ.CheckHoliday(dtPdate.Value.ToShortDateString()); - if (freeday != null && freeday == true) - { - var hrs = float.Parse(tbHrs.Text); - if (hrs > 0) - { - FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n OT에 해당하면 수정하시기 바랍니다."); - //tbOt.Text = tbHrs.Text; - //dr.hrs = 0; - //tbHrs.Text = "0"; - //tbHrs.Focus(); - //return; - } - } - - if (chkAutoAdd.Checked && (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)) - { - if (tbProjectIndex.Text == "" || tbProjectIndex.Text == "-1") - { - FCOMMON.Util.MsgE("프로젝트 주간내역을 등록하려면 프로젝트가 지정되어야 합니다"); - tbProject.Focus(); - tbProject.SelectAll(); - return; - } - else - { - //190906 - FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf); - } - } - - double hrs2 = 0.0; - if (double.TryParse(tbHrs.Text, out hrs2) == false) - { - FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요"); - tbHrs.Focus(); - tbHrs.SelectAll(); - return; - } - - if (double.TryParse(tbOt.Text, out double ot)) - { - var timeterm = dateTimePicker2.Value - dateTimePicker1.Value; - if ((timeterm.TotalMinutes + 1) * 60 <= ot) - { - FCOMMON.Util.MsgE($"OT시간이 지정된 시간대보다 부족합니다.\nOT시간정보를 확인하세요\n" + - $"\n입력시간범위 : {dateTimePicker1.Value.ToString("HH:mm:ss")}~{dateTimePicker2.Value.ToString("HH:mm:ss")}" + - $"\n입력시간(시) : {timeterm.TotalMinutes * 60}"); - dateTimePicker1.Focus(); - return; - } - - if (ot == 0) - { - dr.SetotNull(); - dr.SetotStartNull(); - dr.SetotEndNull(); - } - else - { - dr.ot = ot; - dr.otStart = dateTimePicker1.Value; - dr.otEnd = dateTimePicker2.Value; - } - - } - else - { - dr.SetotNull(); - dr.SetotStartNull(); - dr.SetotEndNull(); - } - - //if(hrs2 > 8) - //{ - // FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요"); - // tbHrs.SelectAll(); - // tbHrs.Focus(); - // return; - //} - - this.dr.uid = this.cmbUser.SelectedValue.ToString(); - this.dr.pdate = dtPdate.Value.ToShortDateString(); - this.dr.status = cmbState.Text; - this.dr.projectName = tbProject.Text; - if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text); - else dr.SetpidxNull(); - this.dr.requestpart = cmbRequest.Text; - this.dr.package = cmbPackage.Text; - this.dr.type = cmbType.Text; - this.dr.process = cmbProcess.Text; - this.dr.tag = tbTag.Text.Trim(); - - if (getKisulInput) - { - this.dr.kisuldiv = cmb_kisuldiv.Text; - this.dr.kisullv = cmb_kisullv.Text; - this.dr.kisulamt = Decimal.Parse(textBox1.Text); - } - - if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text); - else this.dr.hrs = 0; - - //this.dr.description = richTextBox1.Text.Trim(); - - //MessageBox.Show(richTextBox1.Text); - this.dr.description = richTextBoxEx1.Text; - this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf; - this.bs.EndEdit(); - DialogResult = System.Windows.Forms.DialogResult.OK; - } - - private void cmbType_SelectedIndexChanged(object sender, EventArgs e) - { - if (cmbType.Text.Trim() != "" && - cmbType.SelectedIndex >= 0 && - cmbProcess.SelectedIndex < 0 && - cmbUser.SelectedValue != null) - { - //공정을 자동선택해준다. - //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다. - var uid = cmbUser.SelectedValue.ToString(); - var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim()); - if (lastDt != null && lastDt.Rows.Count > 0) - { - var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow; - if (predr["process"] != DBNull.Value) - cmbProcess.Text = predr["process"].ToString(); //190506 - } - - } - chkform_indexchan(sender, e); - - } - - void chkform_indexchan(object sender, EventArgs e) - { - if (cmbType.Text.Trim() != "" && - cmbType.SelectedIndex >= 0 && String.IsNullOrEmpty(cmbState.Text.Trim()) == false) - { - - - //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. - var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim(); - var db = new EEEntities(); - - //프로젝트 제목 서포트 - var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J2" && t.title == formname).FirstOrDefault(); - if (dr0 != null) - { - var rtx = new RichTextBox(); - rtx.Rtf = dr0.body; - lbTitleTip.Text = rtx.Text; - rtx.Dispose(); - } - else - { - lbTitleTip.Text = "프로젝트가 있다면 해당 프로젝트 명을 입력한 후 Enter 키를 눌러서 연결 해주세요"; - } - - var dr = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J1" && t.title == formname).FirstOrDefault(); - if (dr != null) - { - - if (String.IsNullOrEmpty(this.richTextBoxEx1.Text)) - { - this.richTextBoxEx1.Rtf = dr.body; - } - else - { - //뭔가 자료가 있는가? - var header = string.Empty; - - - var rt = new RichTextBoxEx.RichTextBoxEx(); - rt.Rtf = dr.body; - if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim(); - else header = rt.Text.Trim(); - rt.Dispose(); - - if (this.richTextBoxEx1.Text.StartsWith(header) == false) - { - //if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) - { - var oldtext = this.richTextBoxEx1.Text; - this.richTextBoxEx1.Rtf = dr.body; - if (String.IsNullOrEmpty(this.richTextBoxEx1.Text) == false) - this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext; - - //this.richTextBoxEx1.Text += oldtext; - - } - } - } - } - - } - } - - private void dtPdate_ValueChanged(object sender, EventArgs e) - { - var myCI = new System.Globalization.CultureInfo("ko-KR"); - var myCal = myCI.Calendar; - var myCWR = myCI.DateTimeFormat.CalendarWeekRule; - DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; - var dat = myCal.GetWeekOfYear(dtPdate.Value, myCWR, myFirstDOW); - tbWW.Text = "ww" + dat.ToString(); - UpdateWOrkTime(); - - //공휴일이면 시간을 초기화한다. - if (tbHrs.Text == "") tbHrs.Text = "0"; - if (tbOt.Text == "") tbOt.Text = "0"; - float hrs = float.Parse(tbHrs.Text); - //if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday) - //{ - // tbHrs.Enabled = false; - // if (hrs != 0) - // { - // FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다."); - // dr.hrs = 0; - // tbHrs.Text = "0"; - // if (hrs != 8) tbOt.Text = hrs.ToString(); - // tbOt.Focus(); - // } - //} - //else tbHrs.Enabled = true; - } - void UpdateWOrkTime() - { - //이번달 근무시간 및 초과시간 구하기 - if (cmbUser.SelectedValue != null) - { - float work, ot; - int total; - FCOMMON.DBM.getWorkTime(cmbUser.SelectedValue.ToString(), dtPdate.Value.ToString("yyyy-MM"), out work, out total, out ot); - string msg = "금월 근무시간 : {0:N1}h / {1:N0}h, 금월 초과시간 : {2:N1}h"; - lbSummary.Text = string.Format(msg, work, total, ot); - } - else - { - lbSummary.Text = "--"; - } - } - private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) - { - if (cmbUser.SelectedIndex >= 0) - UpdateWOrkTime(); ; - } - - private void tbOt_Validated(object sender, EventArgs e) - { - if (double.TryParse(tbOt.Text, out double ot)) - { - if (ot != 0) - { - - dateTimePicker1.Enabled = true; - dateTimePicker2.Enabled = true; - - //신규데이터라면 자동으로 시간을 설정해준다 - if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached) - { - if (dateTimePicker1.Value == dateTimePicker2.Value) - { - dateTimePicker1.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd" + " 18:00:00")); - dateTimePicker2.Value = dateTimePicker1.Value.AddHours(ot); - } - } - } - else - { - dateTimePicker1.Enabled = false; - dateTimePicker2.Enabled = false; - } - - } - else - { - dateTimePicker1.Enabled = false; - dateTimePicker2.Enabled = false; - - } - } - } + public partial class fJobReport_Add : Form + { + dsPRJ.JobReportRow dr; + Boolean copyMOde = false; + Boolean bInit = false; + bool ReadMode = false; + public fJobReport_Add(dsPRJ.JobReportRow dr_, Boolean copy = false, Boolean read = false) + { + InitializeComponent(); + dr = dr_; + ReadMode = read; + this.KeyPreview = true; + this.StartPosition = FormStartPosition.CenterScreen; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + foreach (Control ctl in this.panel1.Controls) + { + if (ctl.GetType() == typeof(TextBox) || ctl.GetType() == typeof(ComboBox)) + { + ctl.KeyDown += ctl_KeyDown; + } + } + copyMOde = copy; + this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged; + this.grpkisul.Visible = getKisulInput; + } + + void tbProject_SelectedIndexChanged(object sender, EventArgs e) + { + if (bInit == false || this.tbProject.SelectedIndex < 0) return; + var data = this.tbProject.SelectedValue; + if (data == null) return; + if (data.GetType() == typeof(DataRowView)) + { + var drv = data as DataRowView; + var idx = int.Parse(drv["Code"].ToString()); + tbProjectIndex.Text = idx.ToString(); + tbProject.Tag = tbProject.Text; + Console.WriteLine(string.Format("Project Select #1 {0}:{1}", idx, tbProject.Text)); + } + else + { + var idx = int.Parse(data.ToString()); + tbProjectIndex.Text = idx.ToString(); + tbProject.Tag = tbProject.Text; + Console.WriteLine(string.Format("Project Select #2 {0}:{1}", idx, tbProject.Text)); + } + + } + private bool getKisulInput + { + get + { + return FCOMMON.Util.getBit( + FCOMMON.info.Login.gpermission, + (int)FCOMMON.eGroupPermission.jobreport_kisul); + } + } + private void fJobReport_Add_Load(object sender, EventArgs e) + { + //사용자목록 + this.bs.DataSource = dr; + this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm.ss"; + this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm.ss"; + + //해당 사용자에 걸린 프로젝트 목록 가져오기 + var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK); + this.tbProject.DataSource = userProject; + this.tbProject.ValueMember = "Code"; + this.tbProject.DisplayMember = "NameOnly"; + + //상태 + var stateList = FCOMMON.DBM.getCodeTable("12"); + this.cmbState.DisplayMember = "Value"; + this.cmbState.ValueMember = "Value"; + this.cmbState.DataSource = stateList; + this.cmbState.Text = dr.status; + + //요청부서 + var dt_request = FCOMMON.DBM.getCodeTable("13"); + this.cmbRequest.DisplayMember = "Value"; + this.cmbRequest.ValueMember = "Value"; + this.cmbRequest.DataSource = dt_request; + + //패키지 + var dt_package = FCOMMON.DBM.getCodeTable("14"); + this.cmbPackage.DisplayMember = "Value"; + this.cmbPackage.ValueMember = "Value"; + this.cmbPackage.DataSource = dt_package; + + //타입 + var dt_type = FCOMMON.DBM.getCodeTable("15"); + this.cmbType.DisplayMember = "Value"; + this.cmbType.ValueMember = "Value"; + this.cmbType.DataSource = dt_type; + + //공정 + var dt_process = FCOMMON.DBM.getCodeTable("16"); + this.cmbProcess.DisplayMember = "Value"; + this.cmbProcess.ValueMember = "Value"; + this.cmbProcess.DataSource = dt_process; + + if (getKisulInput) + { + //기술분류 + var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50"); + this.cmb_kisuldiv.DisplayMember = "Value"; + this.cmb_kisuldiv.ValueMember = "Value"; + this.cmb_kisuldiv.DataSource = dt_kisuldiv; + + //기술레벨 + var dt_kisullv = FCOMMON.DBM.getCodeTable("51"); + this.cmb_kisullv.DisplayMember = "Value"; + this.cmb_kisullv.ValueMember = "Value"; + this.cmb_kisullv.DataSource = dt_kisullv; + } + + //담당자목록 + + var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); + this.cmbUser.DisplayMember = "dispName"; + this.cmbUser.ValueMember = "id"; + this.cmbUser.DataSource = dt_users; + if (FCOMMON.info.Login.level < 5) cmbUser.Enabled = false; + + // tbWW.Text = dr.ww; + dtPdate.Value = DateTime.Parse(dr.pdate); //일자선택 + cmbUser.SelectedValue = dr.uid; + tbProject.Text = dr.projectName; + cmbRequest.SelectedValue = dr.requestpart; + cmbPackage.SelectedValue = dr.package; + cmbType.SelectedValue = dr.type; + cmbProcess.SelectedValue = dr.process; + tbTag.Text = dr.tag; + + + if (dr.ot > 0) + { + if (dr.ot2 == 0) + { + lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다"; + lbOt2.ForeColor = Color.Blue; + lbotReason.Visible = false; + } + else + { + lbOt2.Text = $"승인시간:{dr.ot2}"; + lbotReason.Text = $"사유:{dr.otReason}"; + } + + } + else + { + lbOt2.Visible = false; + lbotReason.Visible = false; + } + + + if (getKisulInput) + { + cmb_kisuldiv.Text = dr.kisuldiv; + cmb_kisullv.Text = dr.kisullv; + textBox1.Text = dr.kisulamt.ToString(); + } + + if (dr.IsotStartNull()) dateTimePicker1.Value = DateTime.Now; + else dateTimePicker1.Value = dr.otStart; + if (dr.IsotEndNull()) dateTimePicker2.Value = DateTime.Now; + else dateTimePicker2.Value = dr.otEnd; + + //if (cmbRequest.Text == "") cmbRequest.Text = "EE1"; + if (cmbPackage.Text == "") cmbPackage.Text = "Common"; + + if (dr.ot != 0) + { + dateTimePicker1.Enabled = true; + dateTimePicker2.Enabled = true; + } + else + { + dateTimePicker1.Enabled = false; + dateTimePicker2.Enabled = false; + } + + //프로젝트 번호 확인(프로젝트번호가 바뀌면 데이터를 업데이트 해준다) + if (dr.IspidxNull()) + { + tbProjectIndex.Tag = -1; + tbProjectIndex.Text = "-1"; + } + else + { + tbProjectIndex.Tag = dr.pidx; + tbProjectIndex.Text = dr.pidx.ToString(); + } + + //신규일때만 사용가능 함 + if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) chkAutoAdd.Enabled = true; + else chkAutoAdd.Enabled = false; + + + if (string.IsNullOrEmpty(dr.description2)) + { + this.richTextBoxEx1.Text = dr.description; + } + else + { + try + { + this.richTextBoxEx1.Rtf = dr.description2; + } + catch + { + this.richTextBoxEx1.Text = dr.description; + } + } + + this.Show(); + Application.DoEvents(); + + + + var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + if (string.IsNullOrEmpty(MaxVerstion) == false) + { + var curversion = Application.ProductVersion; + var verchk = curversion.CompareTo(MaxVerstion); + if (verchk < 0) + { + //내버젼이 낮다 + FCOMMON.Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + } + } + + + + + if (dr.ot > 0 && dr.ot2 > 0) + { + tbOt.Enabled = false; + FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다"); + } + + //if (this.richTextBoxEx1.Text.Trim() != "") + //{ + // this.richTextBoxEx1.Focus(); + //} + //else + //{ + cmbRequest.Focus(); + // tbProject.SelectAll(); + //} + tbProject.Tag = tbProject.Text; + + // if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description; + + //editor + // ed = new editform.editor(); + //ed.AllowDiscAccess = true; + //ed.WindowTitle = "Quick Edit"; + //ed.StartingFont = new Font("Courier New", 12.0f, FontStyle.Regular); + + //ed.DisplayEditForm(this.panel1); + //ed.AllowRtf = true; + if (ReadMode) + { + panel1.Enabled = false; + this.Text += "(읽기전용)"; + + } + + //신규데이터라면 양식을 처리한다. + if (copyMOde == false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + { + //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. + var db = new EEEntities(); + var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J0").FirstOrDefault(); + if (dr0 != null) + { + richTextBoxEx1.Rtf = dr0.body; + } + db.Dispose(); + } + + + bInit = true; + } + // editform.editor ed; + void ctl_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + Control ctl = sender as Control; + string nm = ctl.Name.ToLower(); + string search = ctl.Text.Trim(); + + Console.WriteLine("inner keydown " + nm + ":" + search); + + switch (nm) + { + //case "cmbrequest": + + // //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다. + // var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc"); + // if (lastprocess != "") cbProcess.Text = lastprocess; + // tbSID.Focus(); + // break; + case "tbdescription": + if (e.Control) + { + btSave.Focus(); + } + break; + case "tbproject": + if (search != "") + { + var f = new fLovProject("%" + search + "%"); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.tbProject.Text = f.Title; + this.tbProject.Tag = f.Title; + this.tbProjectIndex.Text = f.Index.ToString(); + tbHrs.Focus(); + tbHrs.SelectAll(); + + if (tbProjectIndex.Tag.ToString() != f.Index.ToString() || f.Index == -1) + { + //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다. + var uid = cmbUser.SelectedValue.ToString(); + DataTable lastDt = null; + + if (f.Index != -1) lastDt = FCOMMON.DBM.getLastJobReportData(uid, f.Index); + else lastDt = FCOMMON.DBM.getLastJobReportDatabyProjectName(uid, f.Title); + + if (lastDt != null && lastDt.Rows.Count > 0) + { + var predr = lastDt.Rows[0]; + + if (predr["requestpart"] != DBNull.Value) + this.cmbRequest.Text = predr["requestpart"].ToString(); //190506 + + if (predr["package"] != DBNull.Value) + this.cmbPackage.Text = predr["package"].ToString(); //190506 + + if (predr["type"] != DBNull.Value) + this.cmbType.Text = predr["type"].ToString(); //190506 + + if (predr["process"] != DBNull.Value) + cmbProcess.Text = predr["process"].ToString(); //190506 + } + } + } + else + { + //이름만 사용한다. + tbProjectIndex.Text = "-1"; + cmbRequest.Focus(); + } + } + else + { + FCOMMON.Util.MsgE("프로젝트 혹은 아이템이름은 반드시 입력되어야 합니다."); + var tb = sender as ComboBox; + tb.SelectAll(); + tb.Focus(); + } + break; + + default: + SendKeys.Send("{TAB}"); + break; + } + } + } + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString()); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + dtPdate.Value = f.dtSelect; + } + + private void button1_Click(object sender, EventArgs e) + { + this.Invalidate(); + if (tbProject.Text.Trim() == "") + { + FCOMMON.Util.MsgE("프로젝트(아이템) 명칭이 없습니다."); + tbProject.Focus(); + return; + } + if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true) + { + FCOMMON.Util.MsgE("진행 내용이 없습니다."); + this.richTextBoxEx1.Focus(); + return; + } + float hour = Single.Parse(tbHrs.Text) + Single.Parse(tbOt.Text); + if (hour == 0) + { + FCOMMON.Util.MsgE("근무시간/초과시간이 입력되지 않았습니다."); + if (tbHrs.Enabled) tbHrs.Focus(); + else tbOt.Focus(); + return; + } + + if (cmbType.Text.Trim() == "") + { + FCOMMON.Util.MsgE("업무형태를 선택하세요"); + cmbType.Focus(); + return; + } + if (cmbProcess.Text.Trim() == "") + { + FCOMMON.Util.MsgE("공정을 선택하세요"); + cmbProcess.Focus(); + return; + } + if (cmbUser.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다."); + cmbUser.Focus(); + return; + } + + if (tbProject.Tag.ToString() != tbProject.Text && tbProjectIndex.Text != "" && tbProjectIndex.Text != "-1") + { + FCOMMON.Util.MsgE("프로젝트가 선택되었으나 이름이 임의 수정되어 프로젝트 연결을 해제 합니다\n\n" + + "잘못된 프로젝트명은 프로젝트 관리화면에서 변경하시기 바랍니다.\n\n" + + "원본 : " + tbProject.Tag.ToString() + "\n" + + "현재 : " + tbProject.Text); + tbProjectIndex.Text = "-1"; + } + + ///휴일체크 + var taQ = new dsQueryTableAdapters.QueriesTableAdapter(); + var freeday = taQ.CheckHoliday(dtPdate.Value.ToShortDateString()); + if (freeday != null && freeday == true) + { + var hrs = float.Parse(tbHrs.Text); + if (hrs > 0) + { + FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n OT에 해당하면 수정하시기 바랍니다."); + //tbOt.Text = tbHrs.Text; + //dr.hrs = 0; + //tbHrs.Text = "0"; + //tbHrs.Focus(); + //return; + } + } + + if (chkAutoAdd.Checked && (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)) + { + if (tbProjectIndex.Text == "" || tbProjectIndex.Text == "-1") + { + FCOMMON.Util.MsgE("프로젝트 주간내역을 등록하려면 프로젝트가 지정되어야 합니다"); + tbProject.Focus(); + tbProject.SelectAll(); + return; + } + else + { + //190906 + FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf); + } + } + + double hrs2 = 0.0; + if (double.TryParse(tbHrs.Text, out hrs2) == false) + { + FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요"); + tbHrs.Focus(); + tbHrs.SelectAll(); + return; + } + + if (double.TryParse(tbOt.Text, out double ot)) + { + var timeterm = dateTimePicker2.Value - dateTimePicker1.Value; + if ((timeterm.TotalMinutes + 1) * 60 <= ot) + { + FCOMMON.Util.MsgE($"OT시간이 지정된 시간대보다 부족합니다.\nOT시간정보를 확인하세요\n" + + $"\n입력시간범위 : {dateTimePicker1.Value.ToString("HH:mm:ss")}~{dateTimePicker2.Value.ToString("HH:mm:ss")}" + + $"\n입력시간(시) : {timeterm.TotalMinutes * 60}"); + dateTimePicker1.Focus(); + return; + } + + if (ot == 0) + { + dr.SetotNull(); + dr.SetotStartNull(); + dr.SetotEndNull(); + } + else + { + dr.ot = ot; + dr.otStart = dateTimePicker1.Value; + dr.otEnd = dateTimePicker2.Value; + } + } + else + { + dr.SetotNull(); + dr.SetotStartNull(); + dr.SetotEndNull(); + } + + //var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + //if (string.IsNullOrEmpty(MaxVerstion) == false) + //{ + // var curversion = Application.ProductVersion; + // var verchk = curversion.CompareTo(MaxVerstion); + // if (verchk < 0) + // { + // //내버젼이 낮다 + // FCOMMON.Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + // } + //} + ////if(hrs2 > 8) + //{ + // FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요"); + // tbHrs.SelectAll(); + // tbHrs.Focus(); + // return; + //} + + this.dr.uid = this.cmbUser.SelectedValue.ToString(); + this.dr.pdate = dtPdate.Value.ToShortDateString(); + this.dr.status = cmbState.Text; + this.dr.projectName = tbProject.Text; + if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text); + else dr.SetpidxNull(); + this.dr.requestpart = cmbRequest.Text; + this.dr.package = cmbPackage.Text; + this.dr.type = cmbType.Text; + this.dr.process = cmbProcess.Text; + this.dr.tag = tbTag.Text.Trim(); + + if (getKisulInput) + { + this.dr.kisuldiv = cmb_kisuldiv.Text; + this.dr.kisullv = cmb_kisullv.Text; + this.dr.kisulamt = Decimal.Parse(textBox1.Text); + } + + if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text); + else this.dr.hrs = 0; + + //this.dr.description = richTextBox1.Text.Trim(); + + //MessageBox.Show(richTextBox1.Text); + this.dr.description = richTextBoxEx1.Text; + this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf; + this.bs.EndEdit(); + DialogResult = System.Windows.Forms.DialogResult.OK; + } + + private void cmbType_SelectedIndexChanged(object sender, EventArgs e) + { + if (cmbType.Text.Trim() != "" && + cmbType.SelectedIndex >= 0 && + cmbProcess.SelectedIndex < 0 && + cmbUser.SelectedValue != null) + { + //공정을 자동선택해준다. + //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다. + var uid = cmbUser.SelectedValue.ToString(); + var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim()); + if (lastDt != null && lastDt.Rows.Count > 0) + { + var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow; + if (predr["process"] != DBNull.Value) + cmbProcess.Text = predr["process"].ToString(); //190506 + } + + } + chkform_indexchan(sender, e); + + } + + void chkform_indexchan(object sender, EventArgs e) + { + if (cmbType.Text.Trim() != "" && + cmbType.SelectedIndex >= 0 && String.IsNullOrEmpty(cmbState.Text.Trim()) == false) + { + + + //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. + var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim(); + var db = new EEEntities(); + + //프로젝트 제목 서포트 + var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J2" && t.title == formname).FirstOrDefault(); + if (dr0 != null) + { + var rtx = new RichTextBox(); + rtx.Rtf = dr0.body; + lbTitleTip.Text = rtx.Text; + rtx.Dispose(); + } + else + { + lbTitleTip.Text = "프로젝트가 있다면 해당 프로젝트 명을 입력한 후 Enter 키를 눌러서 연결 해주세요"; + } + + var dr = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J1" && t.title == formname).FirstOrDefault(); + if (dr != null) + { + + if (String.IsNullOrEmpty(this.richTextBoxEx1.Text)) + { + this.richTextBoxEx1.Rtf = dr.body; + } + else + { + //뭔가 자료가 있는가? + var header = string.Empty; + + + var rt = new RichTextBoxEx.RichTextBoxEx(); + rt.Rtf = dr.body; + if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim(); + else header = rt.Text.Trim(); + rt.Dispose(); + + if (this.richTextBoxEx1.Text.StartsWith(header) == false) + { + //if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) + { + var oldtext = this.richTextBoxEx1.Text; + this.richTextBoxEx1.Rtf = dr.body; + if (String.IsNullOrEmpty(this.richTextBoxEx1.Text) == false) + this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext; + + //this.richTextBoxEx1.Text += oldtext; + + } + } + } + } + + } + } + + private void dtPdate_ValueChanged(object sender, EventArgs e) + { + var myCI = new System.Globalization.CultureInfo("ko-KR"); + var myCal = myCI.Calendar; + var myCWR = myCI.DateTimeFormat.CalendarWeekRule; + DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; + var dat = myCal.GetWeekOfYear(dtPdate.Value, myCWR, myFirstDOW); + tbWW.Text = "ww" + dat.ToString(); + UpdateWOrkTime(); + + //공휴일이면 시간을 초기화한다. + if (tbHrs.Text == "") tbHrs.Text = "0"; + if (tbOt.Text == "") tbOt.Text = "0"; + float hrs = float.Parse(tbHrs.Text); + //if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday) + //{ + // tbHrs.Enabled = false; + // if (hrs != 0) + // { + // FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다."); + // dr.hrs = 0; + // tbHrs.Text = "0"; + // if (hrs != 8) tbOt.Text = hrs.ToString(); + // tbOt.Focus(); + // } + //} + //else tbHrs.Enabled = true; + } + void UpdateWOrkTime() + { + //이번달 근무시간 및 초과시간 구하기 + if (cmbUser.SelectedValue != null) + { + float work, ot; + int total; + FCOMMON.DBM.getWorkTime(cmbUser.SelectedValue.ToString(), dtPdate.Value.ToString("yyyy-MM"), out work, out total, out ot); + string msg = "금월 근무시간 : {0:N1}h / {1:N0}h, 금월 초과시간 : {2:N1}h"; + lbSummary.Text = string.Format(msg, work, total, ot); + } + else + { + lbSummary.Text = "--"; + } + } + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) + { + if (cmbUser.SelectedIndex >= 0) + UpdateWOrkTime(); ; + } + + private void tbOt_Validated(object sender, EventArgs e) + { + if (double.TryParse(tbOt.Text, out double ot)) + { + if (ot != 0) + { + + dateTimePicker1.Enabled = true; + dateTimePicker2.Enabled = true; + + //신규데이터라면 자동으로 시간을 설정해준다 + if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached) + { + if (dateTimePicker1.Value == dateTimePicker2.Value) + { + dateTimePicker1.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd" + " 18:00:00")); + dateTimePicker2.Value = dateTimePicker1.Value.AddHours(ot); + } + } + } + else + { + dateTimePicker1.Enabled = false; + dateTimePicker2.Enabled = false; + } + + } + else + { + dateTimePicker1.Enabled = false; + dateTimePicker2.Enabled = false; + + } + } + } } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs index 8e0e389..6ebf4f7 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs @@ -263,7 +263,7 @@ namespace FPJ0000.JobReport_ this.progressBar2.Value += 1; var item = baseData.Where(t => t.process == prcitem.memo); //해당 프로세스에 해당하는 아이템을 가져온다 //} - + if (prcitem.memo == null) prcitem.memo = string.Empty; if(prcitem.memo.StartsWith("ASM Feeder Center")) Console.WriteLine("sdf"); diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs index 474b27a..bbfbf36 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs @@ -14,37 +14,7 @@ namespace FPJ0000.OtConfirm { dsPRJ.JobReportRow[] dr; Boolean binit = false; - //public fOTConfirmOK(dsPRJ.JobReportRow dr_) - //{ - // InitializeComponent(); - // dr = dr_; - // //var userlist = FCOMMON.DBM.getUserTable(); - // //this.cmbUser.DataSource = userlist; - // //this.cmbUser.ValueMember = "id"; - // //this.cmbUser.DisplayMember = "dispname"; - - // //textBox1.Text = dr.username; - // //textBox2.Text = dr.pdate; - // //textBox3.Text = dr.projectName; - // //tbRemark.Text = dr.description; - // //numericUpDown2.Value = (decimal)dr.ot; - // //tbRemark.ImeMode = ImeMode.Hangul; - - - - // //var dt = DateTime.Parse(dr.pdate); - // //textBox2.Text = dt.ToLongDateString(); - - // //if(dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) - // //{ - // // numericUpDown1.Value = (decimal)(dr.ot * 1.5f); - // //} - // //else - // //{ - // // numericUpDown1.Value = (decimal)dr.ot; - // //} - //} public fOTConfirmOK(dsPRJ.JobReportRow[] dr_) { InitializeComponent(); diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index a9ba6bb..08720ad 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -480,13 +480,15 @@ namespace FPJ0000 if (col == curyw) { e.Graphics.FillRectangle(Brushes.DeepSkyBlue, rect); + e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); } else { e.Graphics.FillRectangle(Brushes.DimGray, rect); + e.Graphics.DrawString(col, this.Font, Brushes.White, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); } e.Graphics.DrawRectangle(Pens.Black, rect.Left, rect.Top, rect.Width, rect.Height); - e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); + ci += 1; } @@ -581,7 +583,7 @@ namespace FPJ0000 { e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[시작 안함]", this.Font, - (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime), + (isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime), rect2, new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } ); @@ -590,7 +592,7 @@ namespace FPJ0000 { e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[{dr.progress:N1}% 진행 중]", this.Font, - (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime), + (isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime), rect2, new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } );