diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 6f91870..245fcd0 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("19.08.27.1400")] -[assembly: AssemblyFileVersion("19.08.27.1400")] +[assembly: AssemblyVersion("19.08.29.1500")] +[assembly: AssemblyFileVersion("19.08.29.1500")] diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index c2eb9db..e915e94 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -774,7 +774,7 @@ namespace FCOMMON var cmd2 = new SqlCommand("", cn); cmd2.CommandText = string.Format("select count(*) from Items " + - " where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Trim().Replace("'", "''") + model.Trim().Replace("'", "''")); + " where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ","").Replace("'", "''") + model.Replace(" ","").Replace("'", "''")); var cnt = int.Parse(cmd2.ExecuteScalar().ToString()); if (cnt == 0) { @@ -816,7 +816,7 @@ namespace FCOMMON } else { - cmd2.CommandText = string.Format("select idx from Items where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Trim().Replace("'", "''") + model.Trim().Replace("'", "''")); + cmd2.CommandText = string.Format("select min(idx) from Items where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ","").Replace("'", "''")); retval = int.Parse(cmd2.ExecuteScalar().ToString()); } cmd2.Dispose(); diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index ac27f0b..d194313 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -692,8 +692,6 @@ namespace FEQ0000 if (drv == null) return; var dr = drv.Row as dsPurchase.PurchaseRow; - - //현재 데이터를 입력하여 신규 추가를 한다. var newdr = this.dsPurchase.Purchase.NewPurchaseRow(); FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr); diff --git a/SubProject/FLG0000/LogSMTRepare/Add.Designer.cs b/SubProject/FLG0000/LogSMTRepare/Add.Designer.cs new file mode 100644 index 0000000..bca6686 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Add.Designer.cs @@ -0,0 +1,266 @@ +namespace FLG0000.LogData +{ + partial class Add + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.Label deptLabel; + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; + this.tbRemark = new System.Windows.Forms.TextBox(); + this.dtPdate = new System.Windows.Forms.DateTimePicker(); + this.btSave = new System.Windows.Forms.Button(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.linkLabel5 = new System.Windows.Forms.LinkLabel(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.dsLog = new FLG0000.DSLog(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FLG0000.DSLogTableAdapters.Log_SMTRepare_DataTableAdapter(); + this.tbLocation = new System.Windows.Forms.ComboBox(); + this.tbReason = new System.Windows.Forms.ComboBox(); + this.tbResult = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.taItem = new FLG0000.DSLogTableAdapters.Log_SMTRepare_ItemTableAdapter(); + deptLabel = new System.Windows.Forms.Label(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.dsLog)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + this.SuspendLayout(); + // + // deptLabel + // + deptLabel.AutoSize = true; + deptLabel.Location = new System.Drawing.Point(29, 262); + deptLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + deptLabel.Name = "deptLabel"; + deptLabel.Size = new System.Drawing.Size(52, 28); + deptLabel.TabIndex = 0; + deptLabel.Text = "비고"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(9, 19); + label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(72, 28); + label1.TabIndex = 0; + label1.Text = "입력일"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(29, 64); + label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(46, 28); + label2.TabIndex = 9; + label2.Text = "S/N"; + // + // tbRemark + // + this.tbRemark.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbRemark.Location = new System.Drawing.Point(90, 257); + this.tbRemark.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tbRemark.MaxLength = 500; + this.tbRemark.Name = "tbRemark"; + this.tbRemark.Size = new System.Drawing.Size(465, 34); + this.tbRemark.TabIndex = 7; + this.tbRemark.TabStop = false; + // + // dtPdate + // + this.dtPdate.Location = new System.Drawing.Point(90, 16); + this.dtPdate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.dtPdate.Name = "dtPdate"; + this.dtPdate.Size = new System.Drawing.Size(465, 34); + this.dtPdate.TabIndex = 1; + // + // btSave + // + this.btSave.Location = new System.Drawing.Point(23, 303); + this.btSave.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(532, 69); + this.btSave.TabIndex = 8; + this.btSave.Text = "확인(&S)"; + this.btSave.UseVisualStyleBackColor = true; + this.btSave.Click += new System.EventHandler(this.button1_Click); + // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Location = new System.Drawing.Point(29, 212); + this.linkLabel7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(52, 28); + this.linkLabel7.TabIndex = 12; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "결과"; + this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); + // + // linkLabel6 + // + this.linkLabel6.AutoSize = true; + this.linkLabel6.Location = new System.Drawing.Point(29, 160); + this.linkLabel6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.linkLabel6.Name = "linkLabel6"; + this.linkLabel6.Size = new System.Drawing.Size(52, 28); + this.linkLabel6.TabIndex = 11; + this.linkLabel6.TabStop = true; + this.linkLabel6.Text = "원인"; + this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); + // + // linkLabel5 + // + this.linkLabel5.AutoSize = true; + this.linkLabel5.Location = new System.Drawing.Point(29, 108); + this.linkLabel5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.linkLabel5.Name = "linkLabel5"; + this.linkLabel5.Size = new System.Drawing.Size(52, 28); + this.linkLabel5.TabIndex = 10; + this.linkLabel5.TabStop = true; + this.linkLabel5.Text = "위치"; + this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); + // + // dsLog + // + this.dsLog.DataSetName = "dsPurchase"; + this.dsLog.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bs + // + this.bs.DataMember = "Log_SMTRepare_Data"; + this.bs.DataSource = this.dsLog; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tbLocation + // + this.tbLocation.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.tbLocation.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.tbLocation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbLocation.FormattingEnabled = true; + this.tbLocation.Location = new System.Drawing.Point(90, 104); + this.tbLocation.Name = "tbLocation"; + this.tbLocation.Size = new System.Drawing.Size(465, 36); + this.tbLocation.TabIndex = 4; + // + // tbReason + // + this.tbReason.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.tbReason.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.tbReason.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbReason.FormattingEnabled = true; + this.tbReason.Location = new System.Drawing.Point(90, 155); + this.tbReason.Name = "tbReason"; + this.tbReason.Size = new System.Drawing.Size(465, 36); + this.tbReason.TabIndex = 5; + // + // tbResult + // + this.tbResult.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.tbResult.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.tbResult.BackColor = System.Drawing.Color.White; + this.tbResult.FormattingEnabled = true; + this.tbResult.Location = new System.Drawing.Point(90, 207); + this.tbResult.Name = "tbResult"; + this.tbResult.Size = new System.Drawing.Size(465, 36); + this.tbResult.TabIndex = 6; + // + // textBox1 + // + this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox1.Location = new System.Drawing.Point(90, 60); + this.textBox1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.textBox1.MaxLength = 500; + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(465, 34); + this.textBox1.TabIndex = 3; + this.textBox1.TabStop = false; + // + // taItem + // + this.taItem.ClearBeforeFill = true; + // + // Add + // + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 28F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(571, 389); + this.Controls.Add(this.textBox1); + this.Controls.Add(label2); + this.Controls.Add(this.tbResult); + this.Controls.Add(this.tbReason); + this.Controls.Add(this.tbLocation); + this.Controls.Add(this.linkLabel7); + this.Controls.Add(this.linkLabel6); + this.Controls.Add(this.btSave); + this.Controls.Add(this.linkLabel5); + this.Controls.Add(this.dtPdate); + this.Controls.Add(this.tbRemark); + this.Controls.Add(label1); + this.Controls.Add(deptLabel); + this.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Add"; + this.Text = "로그 데이터 추가/변경"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.dsLog)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox tbRemark; + private System.Windows.Forms.DateTimePicker dtPdate; + private System.Windows.Forms.Button btSave; + private DSLog dsLog; + private System.Windows.Forms.BindingSource bs; + private DSLogTableAdapters.Log_SMTRepare_DataTableAdapter ta; + private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.LinkLabel linkLabel5; + private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.LinkLabel linkLabel7; + private System.Windows.Forms.ComboBox tbLocation; + private System.Windows.Forms.ComboBox tbReason; + private System.Windows.Forms.ComboBox tbResult; + private System.Windows.Forms.TextBox textBox1; + private DSLogTableAdapters.Log_SMTRepare_ItemTableAdapter taItem; + } +} \ No newline at end of file diff --git a/SubProject/FLG0000/LogSMTRepare/Add.cs b/SubProject/FLG0000/LogSMTRepare/Add.cs new file mode 100644 index 0000000..e730671 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Add.cs @@ -0,0 +1,425 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FLG0000.LogData +{ + public partial class Add : Form + { + + BindingSource bsManu; + BindingSource bsModel; + DSLog.Log_SMTRepare_DataRow dr; + public Boolean repeatAdd = false; + + public Add(DSLog.Log_SMTRepare_DataRow dr_) + { + InitializeComponent(); + bsManu = new BindingSource(); + bsModel = new BindingSource(); + this.dr = dr_; + this.KeyPreview = true; + this.StartPosition = FormStartPosition.CenterScreen; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + foreach (Control ctl in this.Controls) + { + if (ctl.GetType() == typeof(TextBox) || ctl.GetType() == typeof(ComboBox)) + { + ctl.KeyDown += ctl_KeyDown; + } + } + } + + + + private void __Load(object sender, EventArgs e) + { + + ////장비제조 + //var dt_dept = FCOMMON.DBM.getCodeTable("06"); + //bsManu.DataSource = dt_dept; + //this.cbEQManu.DisplayMember = "Value"; + //this.cbEQManu.ValueMember = "Value"; + //this.cbEQManu.DataSource = bsManu; + + dtPdate.Value = DateTime.Parse(dr.pdate); + + tbLocation.Text = dr.location; + tbReason.Text = dr.reason; + tbResult.Text = dr.result; + + tbLocation.Tag = tbLocation.Text; + tbReason.Tag = tbReason.Text; + tbResult.Tag = tbResult.Text; + + tbRemark.Text = dr.remark; + + this.Show(); + Application.DoEvents(); + textBox1.Focus(); + + } + + 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 "tblocation": + if (search == "") + Lov_Location(search, false); + else if (search.Contains("L")) //바코드입력 + { + var itemList = taItem.GetData(FCOMMON.info.Login.gcode); + var grpdata = itemList.Where(t => t.Barcode == search).FirstOrDefault(); // taItem.GetByBarcode(FCOMMON.info.Login.gcode, search);// FCOMMON.DBM.getCodeBySvalue("19", search); + if (grpdata != null ) + { + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = itemList.Where(t => t.code == codeStr).FirstOrDefault();// FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData != null) + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.Title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.Title; + ctl.Tag = ctl.Text; + } + SendKeys.Send("{TAB}"); + } + else Lov_Location(search, false); + } + break; + case "tbreason": + if (search == "") + Lov_Reason(search, false); + else if (search.StartsWith("L")) //바코드입력 + { + var itemList = taItem.GetData(FCOMMON.info.Login.gcode); + var grpdata = itemList.Where(t => t.Barcode == search).FirstOrDefault(); // taItem.GetByBarcode(FCOMMON.info.Login.gcode, search);// FCOMMON.DBM.getCodeBySvalue("19", search); + if (grpdata != null) + { + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = itemList.Where(t => t.code == codeStr).FirstOrDefault();// FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData != null) + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.Title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.Title; + ctl.Tag = ctl.Text; + } + SendKeys.Send("{TAB}"); + } + else Lov_Reason(search, false); + } + break; + case "tbresult": + if (search.StartsWith("L")) + { + var itemList = taItem.GetData(FCOMMON.info.Login.gcode); + var grpdata = itemList.Where(t => t.Barcode == search).FirstOrDefault(); // taItem.GetByBarcode(FCOMMON.info.Login.gcode, search);// FCOMMON.DBM.getCodeBySvalue("19", search); + if (grpdata != null) + { + if (grpdata.code.Length > 6) + { + //각 깊이별 이름을 다 가져와야한다 + System.Text.StringBuilder sb = new StringBuilder(); + int itemCount = (int)((grpdata.code.Length - 6) / 2.0); + for (int i = 6; i <= grpdata.code.Length; i += 2) + { + var codeStr = grpdata.code.Substring(0, i); + var codeData = itemList.Where(t => t.code == codeStr).FirstOrDefault();// FCOMMON.DBM.getCodeByCode("19", codeStr); + if (codeData != null) + { + if (sb.Length > 0) sb.Append('|'); + sb.Append(codeData.Title.Replace("|", "")); + } + } + ctl.Text = sb.ToString(); + ctl.Tag = ctl.Text; + } + else + { + ctl.Text = grpdata.Title; + ctl.Tag = ctl.Text; + } + btSave.Focus(); + } + else Lov_Result(search, false); + } + else if (search != "") + Lov_Result(search, false); + break; + default: + SendKeys.Send("{TAB}"); + break; + } + } + } + private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Lov_Location("", true); + } + + void Lov_Location(string search, Boolean allowAll) + { + var f = new Lov_LogItem("00", "00"); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + if (f.tbItem.Text.Trim() != "") + this.tbLocation.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbLocation.Text = f.tbGrp.Text.Trim(); + this.tbLocation.Tag = this.tbLocation.Text; + } + } + void Lov_Reason(string search, Boolean allowAll) + { + var f = new Lov_LogItem("00", "01"); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + if (f.tbItem.Text.Trim() != "") + this.tbReason.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbReason.Text = f.tbGrp.Text.Trim(); + this.tbReason.Tag = this.tbReason.Text; + } + } + void Lov_Result(string search, Boolean allowAll) + { + var f = new Lov_LogItem("00", "02"); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + if (f.tbItem.Text.Trim() != "") + this.tbResult.Text = string.Format("{0}|{1}", f.tbGrp.Text, f.tbItem.Text); + else + this.tbResult.Text = f.tbGrp.Text.Trim(); + this.tbResult.Tag = this.tbResult.Text; + } + } + private bool saveData() + { + this.Validate(); + + if (tbLocation.Text.isEmpty()) + { + FCOMMON.Util.MsgE("위치정보가 없습니다."); + tbLocation.Focus(); + return false; + } + + if (tbReason.Text == "") + { + FCOMMON.Util.MsgE("원인을 입력하세요."); + tbReason.Focus(); + return false; + } + //if (tbResult.Text == "") + //{ + // FCOMMON.Util.MsgE("결과를 입력하세요."); + // tbResult.Focus(); + // return false; + //} + + var itemList = taItem.GetData(FCOMMON.info.Login.gcode); + + //임의 기록데이터가 있다면 신규 목록을 추가 한다. + if (tbLocation.Text != tbLocation.Tag.ToString()) + { + + var list = tbLocation.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "00"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = itemList.Where(t => t.Title == strData).FirstOrDefault(); // FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData != null && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = itemList.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + + taItem.Insert(FCOMMON.info.Login.gcode, newCode, strData, "LA" + newCode, "", FCOMMON.info.Login.no, DateTime.Now); + //FCOMMON.DBM.insertCommonCode("19", newCode, strData, "LA" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + + if (this.tbReason.Text != tbReason.Tag.ToString()) + { + + var list = tbReason.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "01"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData.title != "" && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = itemList.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + taItem.Insert(FCOMMON.info.Login.gcode, newCode, strData, "LB" + newCode, "", FCOMMON.info.Login.no, DateTime.Now); + // FCOMMON.DBM.insertCommonCode("19", newCode, strData, "LB" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + if (this.tbResult.Text != tbResult.Tag.ToString()) + { + + var list = tbReason.Text.Split('|'); + int depth = 0; + string codeHeader = ""; + string baseCode = "00" + "02"; //location 은 00,reason 01, 조치 02 + for (int i = 0; i < list.Length; i++) + { + var strData = list[i]; + if (strData.Trim() == "") continue; + + //이 데이터가 존재하지 않으면 추가한다. + var existData = FCOMMON.DBM.getCodeByMemo("19", strData); + if (existData.title != "" && existData.code.StartsWith(baseCode)) baseCode = existData.code; + else + { + //없으므로 신규추가해준다. + int codeLen = 6 + depth * 2; + var filterStr = string.Format("code like '{0}%' and len(code) = {1}", baseCode.Substring(0, codeLen - 2), codeLen); + var preList = itemList.Select(filterStr, "code desc"); + var newCode = ""; + if (preList.Length == 0) + { + newCode = baseCode + "00"; + } + else + { + //동일코드가 하나도 없다. + var lastCode = preList[0]["code"].ToString(); + var lastNo = lastCode.Substring(baseCode.Length, 2); + newCode = baseCode + string.Format("{0:00}", int.Parse(lastNo) + 1); + } + taItem.Insert(FCOMMON.info.Login.gcode, newCode, strData, "LC" + newCode, "", FCOMMON.info.Login.no, DateTime.Now); + //FCOMMON.DBM.insertCommonCode("19", newCode, strData, "LC" + newCode); + baseCode = newCode; + } + depth += 1; + } + } + + + dr.gcode = FCOMMON.info.Login.gcode; + dr.pdate = this.dtPdate.Value.ToShortDateString(); + dr.location = tbLocation.Text.Trim().Replace("|", ""); + dr.reason = tbReason.Text.Trim().Replace("|", ""); + dr.result = tbResult.Text.Trim().Replace("|", ""); + dr.remark = tbRemark.Text.Trim(); + dr.EndEdit(); + return true; + } + + private void button1_Click(object sender, EventArgs e) + { + if (!saveData()) return; + DialogResult = System.Windows.Forms.DialogResult.OK; + } + + + private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //lov 공급처 + Lov_Reason("", true); + } + + private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //lov 프로젝트 + Lov_Result("", true); + } + + } +} diff --git a/SubProject/FLG0000/LogSMTRepare/Add.resx b/SubProject/FLG0000/LogSMTRepare/Add.resx new file mode 100644 index 0000000..541c41d --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Add.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + False + + + False + + + 257, 17 + + + 17, 17 + + + 131, 17 + + + 195, 17 + + + 354, 17 + + + 58 + + \ No newline at end of file diff --git a/SubProject/FLG0000/LogSMTRepare/List.Designer.cs b/SubProject/FLG0000/LogSMTRepare/List.Designer.cs new file mode 100644 index 0000000..8936e85 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/List.Designer.cs @@ -0,0 +1,688 @@ +namespace FLG0000.LogData +{ + partial class List + { + /// + /// 필수 디자이너 변수입니다. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 사용 중인 모든 리소스를 정리합니다. + /// + /// 관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 구성 요소 디자이너에서 생성한 코드 + + /// + /// 디자이너 지원에 필요한 메서드입니다. + /// 이 메서드의 내용을 코드 편집기로 수정하지 마십시오. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List)); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + this.dsPurchase = new FLG0000.DSLog(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FLG0000.DSLogTableAdapters.Log_SMTRepare_DataTableAdapter(); + this.tam = new FLG0000.DSLogTableAdapters.TableAdapterManager(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btAdd = new System.Windows.Forms.ToolStripButton(); + this.btCopy = new System.Windows.Forms.ToolStripButton(); + this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.btDel = new System.Windows.Forms.ToolStripButton(); + this.btSave = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.lbSum = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exportDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.추가ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.cmbLogType = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.dtSD = new System.Windows.Forms.ToolStripTextBox(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); + this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.tbSearch = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + this.cm1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + this.SuspendLayout(); + // + // dsPurchase + // + this.dsPurchase.DataSetName = "dsPurchase"; + this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bs + // + this.bs.DataMember = "Log_SMTRepare_Data"; + this.bs.DataSource = this.dsPurchase; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = true; + this.tam.Log_SMTRepare_DataTableAdapter = this.ta; + this.tam.Log_SMTRepare_ItemTableAdapter = null; + this.tam.UpdateOrder = FLG0000.DSLogTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel6, + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.btAdd, + this.btCopy, + this.btEdit, + this.btDel, + this.btSave, + this.toolStripSeparator1, + this.toolStripLabel1, + this.lbSum, + this.toolStripLabel5, + this.toolStripLabel2, + this.tbFind, + this.btFind, + this.toolStripSeparator6}); + this.bn.Location = new System.Drawing.Point(0, 639); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(1074, 26); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 23); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // toolStripLabel6 + // + this.toolStripLabel6.ForeColor = System.Drawing.Color.Gray; + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(57, 23); + this.toolStripLabel6.Text = "[LG0000]"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 23); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 23); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 26); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 26); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 23); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 23); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 26); + // + // btAdd + // + this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image"))); + this.btAdd.Name = "btAdd"; + this.btAdd.RightToLeftAutoMirrorImage = true; + this.btAdd.Size = new System.Drawing.Size(67, 23); + this.btAdd.Text = "추가(&A)"; + this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); + // + // btCopy + // + this.btCopy.Image = ((System.Drawing.Image)(resources.GetObject("btCopy.Image"))); + this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btCopy.Name = "btCopy"; + this.btCopy.Size = new System.Drawing.Size(67, 23); + this.btCopy.Text = "복사(&C)"; + this.btCopy.Click += new System.EventHandler(this.toolStripButton1_Click_2); + // + // btEdit + // + this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); + this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btEdit.Name = "btEdit"; + this.btEdit.Size = new System.Drawing.Size(65, 23); + this.btEdit.Text = "편집(&E)"; + this.btEdit.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // btDel + // + this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); + this.btDel.Name = "btDel"; + this.btDel.RightToLeftAutoMirrorImage = true; + this.btDel.Size = new System.Drawing.Size(68, 23); + this.btDel.Text = "삭제(&D)"; + this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + // + // btSave + // + this.btSave.Image = global::FLG0000.Properties.Resources.action_save; + this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(66, 23); + this.btSave.Text = "저장(&S)"; + this.btSave.Click += new System.EventHandler(this.btSave_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 26); + // + // toolStripLabel1 + // + this.toolStripLabel1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(19, 23); + this.toolStripLabel1.Text = "건"; + // + // lbSum + // + this.lbSum.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.lbSum.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbSum.Name = "lbSum"; + this.lbSum.Size = new System.Drawing.Size(22, 23); + this.lbSum.Text = "0"; + // + // toolStripLabel5 + // + this.toolStripLabel5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(31, 23); + this.toolStripLabel5.Text = "합계"; + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 23); + this.toolStripLabel2.Text = "검색"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(100, 26); + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 23); + this.btFind.Text = "toolStripButton2"; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 26); + // + // cm1 + // + this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.columnSizeToolStripMenuItem, + this.exportDataToolStripMenuItem, + this.toolStripMenuItem3, + this.추가ToolStripMenuItem, + this.makeRepeatToolStripMenuItem, + this.편집ToolStripMenuItem1, + this.삭제ToolStripMenuItem}); + this.cm1.Name = "contextMenuStrip1"; + this.cm1.Size = new System.Drawing.Size(203, 262); + // + // columnSizeToolStripMenuItem + // + this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveToolStripMenuItem, + this.loadToolStripMenuItem, + this.resetToolStripMenuItem}); + this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.columnSizeToolStripMenuItem.Text = "열 너비"; + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.saveToolStripMenuItem.Text = "저장"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // loadToolStripMenuItem + // + this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); + this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + this.loadToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.loadToolStripMenuItem.Text = "불러오기"; + this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); + // + // resetToolStripMenuItem + // + this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); + this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; + this.resetToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.resetToolStripMenuItem.Text = "초기화"; + this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); + // + // exportDataToolStripMenuItem + // + this.exportDataToolStripMenuItem.Name = "exportDataToolStripMenuItem"; + this.exportDataToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.exportDataToolStripMenuItem.Text = "내보내기"; + this.exportDataToolStripMenuItem.Click += new System.EventHandler(this.exportDataToolStripMenuItem_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + // + // 추가ToolStripMenuItem + // + this.추가ToolStripMenuItem.Name = "추가ToolStripMenuItem"; + this.추가ToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.추가ToolStripMenuItem.Text = "추가"; + this.추가ToolStripMenuItem.Click += new System.EventHandler(this.추가ToolStripMenuItem_Click); + // + // makeRepeatToolStripMenuItem + // + this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.makeRepeatToolStripMenuItem.Text = "복사"; + this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); + // + // 편집ToolStripMenuItem1 + // + this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(202, 42); + this.편집ToolStripMenuItem1.Text = "편집"; + this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click); + // + // 삭제ToolStripMenuItem + // + this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.삭제ToolStripMenuItem.Text = "삭제"; + this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel7, + this.cmbLogType, + this.toolStripLabel4, + this.dtSD, + this.lbEnd, + this.dtED, + this.toolStripSeparator2, + this.toolStripLabel3, + this.tbSearch, + this.toolStripSeparator4, + this.btSearch, + this.toolStripButton2}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1074, 37); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel7.Text = "종류"; + // + // cmbLogType + // + this.cmbLogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbLogType.Items.AddRange(new object[] { + "[00] Feeder", + "[01] Head", + "[02] DP"}); + this.cmbLogType.Name = "cmbLogType"; + this.cmbLogType.Size = new System.Drawing.Size(130, 37); + // + // toolStripLabel4 + // + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel4.Text = "기간"; + // + // dtSD + // + this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Name = "dtSD"; + this.dtSD.Size = new System.Drawing.Size(90, 37); + this.dtSD.Text = "1982-11-23"; + this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lbEnd + // + this.lbEnd.Name = "lbEnd"; + this.lbEnd.Size = new System.Drawing.Size(15, 34); + this.lbEnd.Text = "~"; + this.lbEnd.Click += new System.EventHandler(this.lbEnd_Click); + // + // dtED + // + this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Name = "dtED"; + this.dtED.Size = new System.Drawing.Size(90, 37); + this.dtED.Text = "1982-11-23"; + this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel3.Text = "검색"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); + // + // tbSearch + // + this.tbSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSearch.Name = "tbSearch"; + this.tbSearch.Size = new System.Drawing.Size(150, 37); + this.tbSearch.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 37); + // + // btSearch + // + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(80, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 37); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(1074, 602); + this.fpSpread1.TabIndex = 4; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 7; + 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 = "S/N"; + 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.Rows.Get(0).Height = 40F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "S/N"; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "location"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "위치"; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "reason"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "원인"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "result"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "결과"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "remark"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userName"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "등록자"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoHeadings = false; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // + // List + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1074, 665); + this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.DoubleBuffered = true; + this.Name = "List"; + this.Text = "로그 목록"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + this.cm1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DSLog dsPurchase; + private System.Windows.Forms.BindingSource bs; + private DSLogTableAdapters.Log_SMTRepare_DataTableAdapter ta; + private DSLogTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripButton btAdd; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton btDel; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripTextBox dtSD; + private System.Windows.Forms.ToolStripLabel lbEnd; + private System.Windows.Forms.ToolStripTextBox dtED; + private System.Windows.Forms.ToolStripButton btSearch; + private System.Windows.Forms.ContextMenuStrip cm1; + private System.Windows.Forms.ToolStripLabel toolStripLabel3; + private System.Windows.Forms.ToolStripTextBox tbSearch; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel5; + private System.Windows.Forms.ToolStripLabel lbSum; + private System.Windows.Forms.ToolStripButton btSave; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripTextBox tbFind; + private System.Windows.Forms.ToolStripButton btFind; + private FarPoint.Win.Spread.FpSpread fpSpread1; + private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; + private System.Windows.Forms.ToolStripButton btEdit; + private System.Windows.Forms.ToolStripMenuItem exportDataToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; + private System.Windows.Forms.ToolStripButton btCopy; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripMenuItem makeRepeatToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 추가ToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripLabel toolStripLabel4; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripComboBox cmbLogType; + } +} diff --git a/SubProject/FLG0000/LogSMTRepare/List.cs b/SubProject/FLG0000/LogSMTRepare/List.cs new file mode 100644 index 0000000..ae96410 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/List.cs @@ -0,0 +1,419 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using util = FCOMMON.Util; + +namespace FLG0000.LogData +{ + public partial class List : FCOMMON.fBase + { + string fn_fpcolsize = ""; + UserSetting userset = null; + public List() + { + InitializeComponent(); + + //화면전용 설정파일 + var usersetfile = new System.IO.FileInfo(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, + "Setting", "LG0000.xml")); + if (usersetfile.Directory.Exists == false) usersetfile.Directory.Create(); + userset = new UserSetting(usersetfile.FullName); + userset.Load(); + if (userset.Xml.Exist() == false) userset.Xml.CreateFile(); + + + fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); + this.dsPurchase.Log_SMTRepare_Data.TableNewRow += Purchase_TableNewRow; + this.FormClosed += __Closed; + dtSD.KeyDown += dtSD_KeyDown; + dtED.KeyDown += dtSD_KeyDown; + //this.dv1.CellFormatting += dv1_CellFormatting; + } + + void __Closed(object sender, FormClosedEventArgs e) + { + FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); + } + + private void __Load(object sender, EventArgs e) + { + //마지막에 사용한 값으로 자동 선택해준다. + cmbLogType.Text = userset.lastType; + + //선택된 자료가 없고 아이템이 잇다면 1번 항목으로 설정한다. + if (cmbLogType.SelectedIndex < 0) cmbLogType.SelectedIndex = 0; + + this.tbSearch.Text = string.Empty; + this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString(); + this.dtED.Text = DateTime.Now.ToShortDateString(); + + refreshData(); + } + void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["gcode"] = FCOMMON.info.Login.gcode; + e.Row["pdate"] = DateTime.Now.ToShortDateString(); + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["lcode"] = "00"; + } + private void refreshData() + { + + try + { + var search = tbSearch.Text.Trim(); + this.dsPurchase.Log_SMTRepare_Data.Clear(); + this.ta.Fill(this.dsPurchase.Log_SMTRepare_Data, + FCOMMON.info.Login.gcode, + dtSD.Text, dtED.Text, "%" + search + "%"); + this.dsPurchase.Log_SMTRepare_Data.AcceptChanges(); + showSummary(); + FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + if(userset.lastType != cmbLogType.Text) + { + userset.lastType = cmbLogType.Text; + userset.Save(); + } + } + catch (System.Exception ex) + { + System.Windows.Forms.MessageBox.Show(ex.Message); + } + + FormattingData(); + } + void FormattingData() + { + //삭제컬럼인덱스 + this.fpSpread1.SuspendLayout(); + //var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index; + //var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; + for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) + { + + } + this.fpSpread1.ResumeLayout(); + } + + void dtSD_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode != Keys.Enter) return; + var tb = sender as ToolStripTextBox; + var input = tb.Text.Trim(); + if (input == "") tb.Text = DateTime.Now.ToShortDateString(); + else + { + string dt = string.Empty; + if (!util.MakeDateString(input, out dt)) + { + FCOMMON.Util.MsgE("입력값이 올바르지 않습니다."); + tb.SelectAll(); + tb.Focus(); + return; + } + else + { + tb.Text = dt; + } + } + if (tb == dtSD) + { + dtED.Focus(); + dtED.SelectAll(); + } + else + { + btSearch.PerformClick(); + tb.SelectAll(); + } + } + + + + private void saveData(Boolean prompt) + { + this.Validate(); + this.bs.EndEdit(); + try + { + var cnt = this.ta.Update(this.dsPurchase.Log_SMTRepare_Data); + if (prompt) FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 저장 되었습니다.", cnt)); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); + } + } + void showSummary() + { + decimal sum = 0; + var list = this.dsPurchase.Log_SMTRepare_Data.Select(this.bs.Filter, "") as DSLog.Log_SMTRepare_DataRow[]; + // sum = list.Sum(t => t.pumamt); + //foreach (dsPurchase.PurchaseRow dr in this.dsPurchase.Purchase.Rows) + //if (!dr.IspumamtNull()) sum += dr.pumamt; + lbSum.Text = list.Count().ToString("N0"); + } + + private void btSearch_Click(object sender, EventArgs e) + { + refreshData(); + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + func_add(); + } + + private void tbRequest_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + btSearch.PerformClick(); + } + + private void btSave_Click(object sender, EventArgs e) + { + saveData(true); + } + + + private void lbEnd_Click(object sender, EventArgs e) + { + //end date + var list = FCOMMON.DBM.getGroupList("pdate", "purchase", "pdate >= '" + dtSD.Text + "'", true); + FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dtED.Text = f.Title; + btSearch.PerformClick(); + } + } + + private void toolStripLabel3_Click(object sender, EventArgs e) + { + //사용자목록처리 + if (tbSearch.Text.Trim() == "") + { + tbSearch.Text = FCOMMON.info.Login.nameK; + } + else + { + tbSearch.Text = string.Empty; + } + + refreshData(); + } + + + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + func_delete(); + } + void func_add() + { + var newdr = this.dsPurchase.Log_SMTRepare_Data.NewLog_SMTRepare_DataRow();//.NewPurchaseRow(); + var f = new LogData.Add(newdr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.dsPurchase.Log_SMTRepare_Data.AddLog_SMTRepare_DataRow(newdr); + int cnt = this.ta.Update(newdr); + if (cnt == 0) FCOMMON.Util.MsgE("저장 실패\n\n다시 시도하시고 증상이 반복되면 chikyun.kim@amkor.co.kr 로 문의 주십시요"); + newdr.AcceptChanges(); + refreshData(); //181210 + } + else newdr.Delete(); + } + void func_delete() + { + var drv = bs.Current as DataRowView; + if (drv == null) return; + + var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + bs.RemoveCurrent(); + + try + { + int cnt = ta.Update(this.dsPurchase); + if (cnt != 1) + FCOMMON.Util.MsgE(cnt.ToString() + "건의 자료가 삭제되었습니다."); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("delete error\n" + ex.Message); + } + } + + + + private void btFind_Click(object sender, EventArgs e) + { + var search = tbFind.Text.Trim(); + search = search.Replace("*", "x"); + if (tbFind.Text != search) tbFind.Text = search; + try + { + if (search.isEmpty()) + { + this.bs.Filter = ""; + tbFind.BackColor = Color.White; + } + else + { + search = search.Replace("'", "''"); + string filter = "serial like ? or location like ? or reason like ? or result like ? or remark like ?"; + filter = filter.Replace("?", "'%" + search + "%'"); + this.bs.Filter = filter; + tbFind.BackColor = Color.Lime; + } + tbFind.SelectAll(); + tbFind.Focus(); + showSummary(); + } + catch (Exception ex) + { + this.tbFind.BackColor = Color.Tomato; + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void tbFind_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) btFind.PerformClick(); + } + + private void editDataToolStripMenuItem_Click(object sender, EventArgs e) + { + Func_Edit(); + } + void Func_Edit() + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DSLog.Log_SMTRepare_DataRow; + + var f = new LogData.Add(dr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + //존재하지 않는 sid 는 추가를 해준다. + if (dr.RowState != DataRowState.Unchanged) + { + this.ta.Update(dr); + dr.AcceptChanges(); + } + } + else dr.RejectChanges(); + } + + private void autoToolStripMenuItem_Click(object sender, EventArgs e) + { + FCOMMON.Util.FPColSizeAuto(this.fpSpread1); + } + + private void resetToolStripMenuItem_Click(object sender, EventArgs e) + { + foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) + { + col.Width = 100; + } + } + + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize); + } + + private void loadToolStripMenuItem_Click(object sender, EventArgs e) + { + FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize); + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + Func_Edit(); + } + + + private void exportDataToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveFileDialog sd = new SaveFileDialog(); + sd.Filter = "excel|*.xls"; + sd.FileName = "logdata.xls"; + if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + fpSpread1.SaveExcel(sd.FileName, + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + } + + } + + + + void func_copy() + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DSLog.Log_SMTRepare_DataRow; + + //현재 데이터를 입력하여 신규 추가를 한다. + var newdr = this.dsPurchase.Log_SMTRepare_Data.NewLog_SMTRepare_DataRow(); + FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.pdate = DateTime.Now.ToShortDateString(); + newdr.wdate = DateTime.Now; + newdr.wuid = FCOMMON.info.Login.no; + newdr.EndEdit(); + + var f = new LogData.Add(newdr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + + this.dsPurchase.Log_SMTRepare_Data.AddLog_SMTRepare_DataRow(newdr);//.Purchase.AddPurchaseRow(newdr); + this.ta.Update(newdr); + newdr.AcceptChanges(); + } + else newdr.Delete(); + } + + + private void toolStripButton1_Click_2(object sender, EventArgs e) + { + func_copy(); + } + + private void makeRepeatToolStripMenuItem_Click(object sender, EventArgs e) + { + func_copy(); + } + + private void 편집ToolStripMenuItem1_Click(object sender, EventArgs e) + { + Func_Edit(); + } + + private void 삭제ToolStripMenuItem_Click(object sender, EventArgs e) + { + func_delete(); + } + + private void 추가ToolStripMenuItem_Click(object sender, EventArgs e) + { + func_add(); + } + + private void toolStripButton2_Click_1(object sender, EventArgs e) + { + this.Close(); + } + + } +} diff --git a/SubProject/FLG0000/LogSMTRepare/List.resx b/SubProject/FLG0000/LogSMTRepare/List.resx new file mode 100644 index 0000000..ce06968 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/List.resx @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 131, 17 + + + 195, 17 + + + 257, 17 + + + 330, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFDSURBVDhPlZK9SgNREIXzOpY+gEXQIg+QkMLOTuwsLNRU + ViKIja0SbMRCBQsLUxgQArERf1ARCaLBCErUIoWJjnyzTna4Ccs6cLLkzpzvnr17M5KiMknFQPXyQfbO + m6rNkxtZ3q9LqVyR2bVdVSKEJsbr53dpvnVUrx/RE61W2zI5v6EQqz9rVCwAYLj2+KP6VyL+bJ825LPz + pWYzpknUB7CLARgIE6HK/bfO0F86aklhZiWC8ENEA9D0iUKAKRHgE5kZHdz2VPTyUwsxYHHrWN+TIQAe + 6M07F10VvVx+OgZwsgaYO3wZAHhz+ayr5zMAwGAAn8gDMA8F8Fmu7p4Uwh3wibx5vd5TNVptyeaKMQAD + p4o4HJ9oGAD42EQhBoTlE9kFYleEmZQjo+M6q5fJF4thIt4XEZudMfc/Y1i6mrpEfgGL0hchHI3KDgAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEvSURBVDhPpZI/S0JRGIed+i6Nbk0t0iCuSkuDi1MfIKfm + +gAOQktTQkMggYtRkwgidKmgyQwMCgqz0CivvvK8cK7neG4KdeHhHs45v+c9/xLyz08Ft713OQ+6SqXV + kfLlnXJw1lSK5VrERqGkMB4JCCLpvQ7lZfDlQJ+B4EnwI9nTkbYdAZMbjxOPq4eJPH1MvXC2sD8XsOzP + 0bcX/C3MXEfAfmzBsnCnP10uWBWu3IS+gJOm0w5fHCZiw0aQzu3GC0xYgm2R+poTRnh8HeqNOALu920w + 9MK0F8NGkMrs+ALewqrwUXss3ed+vKB6H+rh2OT3SjpO0IBgcyvnCjgDBGCq8mcMiQ3FHAGdLB/J4vMF + KhoI83LXk6m5gCpmufbyOWlgv0BVIMx4JPj7JzIDGHRUPz2nxiQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + 504, 23 + + + + R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh + e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw + QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK + HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC + un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= + + + + + R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 + 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ + IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj + SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG + vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + + + + R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R + PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg + oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX + dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7 + + + + 396, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQgSURBVEhLtVdbT1NZGD3RmehPcJyYaLz7PqOJD74anYgo + pqJQLK1SryhWKiA52BmR9gCtThFRURBsvaETVCrFBpC2tFQFNBHvPUXFS5QCo75p7TrsTY9QlcpxJTs9 + ybf2t7ov32UzsWLVqrPjl+36b/LK3Pr5K3LrF8blXJ2yiG38hZilhYxtmKUocnObSjsdO8q7AhnH7/ey + Vv7T3pqeUOaxux8SdY4lhCoNZGzjVOUBn3X3yYdvDXXBEGfrGzH+ufgqtEbX8BeZMnbIDS6NpvLBM84W + XZCO4cJyfYsj/XAnP3wkFTi7V+ba4ghtJHCGqQZ3WZ6l571YACvOtAb6t5bdcW80t1tVprajKpO3fL3J + U5vAXvuTTGc2l3bWi+dhaCr4l8mcK5lQogOi+bXPP9JJhrq+kLby0fPUIm+ZLL9hFqF9FSOFgyF5YWst + MUcHtle8Uv2V3lDaQV9zEtc8jVC+i2grzrL436cUuLYRypfARRo804io0th2YfHWugmEMipQYa2VDxZc + 7h0S11R0dUddgMrkOU0vErY37d8bTbGKAhDGmSYVtCjV5nY3FYZPVbGvitAGsVbnmI2QoSScaSzbK8ba + /c6mJM61Gt/LdU1z4Yv61VQ8eZmos88UiICCc3M0TvGrKPYeJqaYEae1TSWfAlRG7/FISIZ9hxMRMTEM + MhL9VzkW/8AK8b8aIxAJmRZ/P/W/saTDLhgQt0iD1LCttMMlGCTElkO3PdQ/tITcvjT70u9ZlU/6qEFt + vnWa8CWD+uCtM9R/VqW/D0WGiWftC/bWBIYSRqrRV0b4kgE+qX8Ul/hs+wIG5S2vhv+pwutNbUeo/7zz + /Mf43Lo/hK0WH36a2Sf9Vpe0n6P+UVKXaC5PYjZsuPGr+HLhIhC+ZBBfroyj9/y40IJBfaj9GjVkWvh+ + KcMpkW2ck2MJDFD/m0o7GogpfPiFnkJxkCPoiUnA8KQQC5TF3mPi5CTnXHpiYpiEPY7ZO6sev6b/Cmku + Yd/1ebAh/SENCsQYgZZJW3X/BfWbUf34TUL+1RnEPAil0WtFIqekcJFwJe5vku+qftiDxE9oo0Y4SUyE + j4jPIKpdNTFHIDM4pu84cfcpFUZJ01r4IL5jFYaowuipRWml/nae6OqWhTtSQvkSKXqnOq8m8D8l0xGL + MLZXbb7pFIuy5/l38sKWdEKJjpSi1kuRizZ6YZnOPldZ5C3HmYqPDG1UCuf8drVL1jfLcKZiUQyxMBo7 + NHho9NDwqUs6ziBO91j4AXp76cBKIToUt9GA1hMtaLTWFC0roTFoZdHSigVGjmBIEz7TZEPLdjJt7PiW + MFaMkFEY20599SL9KPBcwbMFzxdUGuTe9PIuHtlvHdeql/3tmE6o0gJFHA81PNhQ2eKzbb+xLDuOmEcJ + hvkMi1v0OLU4S10AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + + + + 579, 23 + + + 579, 23 + + \ No newline at end of file diff --git a/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.Designer.cs b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.Designer.cs new file mode 100644 index 0000000..b9a39fa --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.Designer.cs @@ -0,0 +1,138 @@ +namespace FLG0000.LogData +{ + partial class Lov_LogItem + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tbGrp = new System.Windows.Forms.TextBox(); + this.tbItem = new System.Windows.Forms.TextBox(); + this.btOK = new System.Windows.Forms.Button(); + this.listBox1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.listBox2 = new System.Windows.Forms.ListView(); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.taItem = new FLG0000.DSLogTableAdapters.Log_SMTRepare_ItemTableAdapter(); + this.SuspendLayout(); + // + // tbGrp + // + this.tbGrp.Location = new System.Drawing.Point(14, 192); + this.tbGrp.Margin = new System.Windows.Forms.Padding(2); + this.tbGrp.Name = "tbGrp"; + this.tbGrp.Size = new System.Drawing.Size(561, 46); + this.tbGrp.TabIndex = 1; + // + // tbItem + // + this.tbItem.Location = new System.Drawing.Point(14, 426); + this.tbItem.Margin = new System.Windows.Forms.Padding(2); + this.tbItem.Name = "tbItem"; + this.tbItem.Size = new System.Drawing.Size(561, 46); + this.tbItem.TabIndex = 2; + // + // btOK + // + this.btOK.Location = new System.Drawing.Point(12, 482); + this.btOK.Name = "btOK"; + this.btOK.Size = new System.Drawing.Size(563, 52); + this.btOK.TabIndex = 3; + this.btOK.Text = "확인"; + this.btOK.UseVisualStyleBackColor = true; + this.btOK.Click += new System.EventHandler(this.btOK_Click); + // + // listBox1 + // + this.listBox1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1}); + this.listBox1.FullRowSelect = true; + this.listBox1.GridLines = true; + this.listBox1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.listBox1.Location = new System.Drawing.Point(14, 12); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(561, 175); + this.listBox1.TabIndex = 4; + this.listBox1.UseCompatibleStateImageBehavior = false; + this.listBox1.View = System.Windows.Forms.View.Details; + // + // columnHeader1 + // + this.columnHeader1.Width = 544; + // + // listBox2 + // + this.listBox2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader2}); + this.listBox2.FullRowSelect = true; + this.listBox2.GridLines = true; + this.listBox2.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.listBox2.Location = new System.Drawing.Point(14, 246); + this.listBox2.Name = "listBox2"; + this.listBox2.Size = new System.Drawing.Size(561, 175); + this.listBox2.TabIndex = 5; + this.listBox2.UseCompatibleStateImageBehavior = false; + this.listBox2.View = System.Windows.Forms.View.Details; + // + // columnHeader2 + // + this.columnHeader2.Width = 544; + // + // taItem + // + this.taItem.ClearBeforeFill = true; + // + // Lov_LogItem + // + this.AutoScaleDimensions = new System.Drawing.SizeF(16F, 40F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(592, 550); + this.Controls.Add(this.listBox2); + this.Controls.Add(this.listBox1); + this.Controls.Add(this.btOK); + this.Controls.Add(this.tbItem); + this.Controls.Add(this.tbGrp); + this.Font = new System.Drawing.Font("맑은 고딕", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.Margin = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.Name = "Lov_LogItem"; + this.Text = "Lov_LogItem"; + this.Load += new System.EventHandler(this.@__Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btOK; + private System.Windows.Forms.ListView listBox1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ListView listBox2; + private System.Windows.Forms.ColumnHeader columnHeader2; + public System.Windows.Forms.TextBox tbGrp; + public System.Windows.Forms.TextBox tbItem; + private DSLogTableAdapters.Log_SMTRepare_ItemTableAdapter taItem; + } +} \ No newline at end of file diff --git a/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.cs b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.cs new file mode 100644 index 0000000..306aa67 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FLG0000.LogData +{ + public partial class Lov_LogItem : Form + { + bool binit = false; + string logType = ""; + string logDiv = ""; + + DSLog.Log_SMTRepare_ItemDataTable dtList = null; + public Lov_LogItem(string logType_, string logDiv_) + { + InitializeComponent(); + this.logType = logType_; + this.logDiv = logDiv_; + this.listBox1.MultiSelect = false; + this.listBox1.FullRowSelect = true; + this.listBox1.GridLines = true; + this.listBox1.SelectedIndexChanged += listBox1_SelectedIndexChanged; + + + this.listBox2.MultiSelect = false; + this.listBox2.FullRowSelect = true; + this.listBox2.GridLines = true; + this.listBox2.SelectedIndexChanged += listBox2_SelectedIndexChanged; + } + + private void __Load(object sender, EventArgs e) + { + //해다 자료를 불러와서 표시해준다. + var typestr = logType + logDiv; + this.Text = typestr; + + this.Show(); + Application.DoEvents(); + + + dtList = taItem.GetData(FCOMMON.info.Login.gcode);// FCOMMON.DBM.getCodeTable("19"); + + var grplist = dtList.AsEnumerable().Where(t => t.code.StartsWith(typestr) && t.code.Length == 6); + this.listBox1.Items.Clear(); + foreach (var item in grplist) + { + var lv = this.listBox1.Items.Add(item.Title); + lv.Tag = item.code;// item[0].ToString(); + } + binit = true; + + this.tbGrp.Focus(); + } + + void listBox2_SelectedIndexChanged(object sender, EventArgs e) + { + if (binit == false) return; + var listview = sender as ListView; + if (listview.SelectedItems.Count > 0) + { + this.tbItem.Text = listview.SelectedItems[0].Text; + } + } + + void listBox1_SelectedIndexChanged(object sender, EventArgs e) + { + if (binit == false) return; + var listview = sender as ListView; + this.listBox2.Items.Clear(); + if (listview.SelectedItems.Count > 0) + { + this.tbGrp.Text = listview.SelectedItems[0].Text; + var typestr = listBox1.SelectedItems[0].Tag.ToString();// listBox1.Items[listBox1.SelectedIndex].ToString(); + var grplist = dtList .Where(t=>t.code.StartsWith(typestr) && t.code.Length == 8); + foreach (var item in grplist) + { + //string data = string.Format("[{0}] {1}", item[0], item[1]); + var lv = this.listBox2.Items.Add(item.Title);// item[1].ToString()); + lv.Tag = item.code;// item[0]; + } + } + } + + + + private void btOK_Click(object sender, EventArgs e) + { + DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} diff --git a/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.resx b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.resx new file mode 100644 index 0000000..4cacf63 --- /dev/null +++ b/SubProject/FLG0000/LogSMTRepare/Lov_LogItem.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 6299b5d..e4a1ae4 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -51,7 +51,8 @@ System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.Label label5; this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -98,6 +99,7 @@ this.cmbPart = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.textBox4 = new System.Windows.Forms.TextBox(); this.tbPath = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); @@ -131,7 +133,7 @@ this.bsSchedule = new System.Windows.Forms.BindingSource(this.components); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.cmbCate = new System.Windows.Forms.ComboBox(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); sdateLabel = new System.Windows.Forms.Label(); @@ -153,6 +155,7 @@ label6 = new System.Windows.Forms.Label(); label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -719,8 +722,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -850,6 +853,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(this.cmbCate); + this.panel1.Controls.Add(label5); this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(label9); this.panel1.Controls.Add(this.textBox4); @@ -870,6 +875,17 @@ this.panel1.Size = new System.Drawing.Size(547, 145); this.panel1.TabIndex = 86; // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(32, 119); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(53, 12); + this.linkLabel1.TabIndex = 87; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "공유폴더"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // // textBox4 // this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "orderno", true)); @@ -893,7 +909,7 @@ this.textBox2.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.textBox2.Location = new System.Drawing.Point(93, 85); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(256, 21); + this.textBox2.Size = new System.Drawing.Size(113, 21); this.textBox2.TabIndex = 7; // // arLabel2 @@ -1447,16 +1463,28 @@ // this.taSchedule.ClearBeforeFill = true; // - // linkLabel1 + // cmbCate // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(32, 119); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(53, 12); - this.linkLabel1.TabIndex = 87; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "공유폴더"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbCate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbCate.FormattingEnabled = true; + this.cmbCate.Location = new System.Drawing.Point(246, 85); + this.cmbCate.Margin = new System.Windows.Forms.Padding(4); + this.cmbCate.Name = "cmbCate"; + this.cmbCate.Size = new System.Drawing.Size(103, 20); + this.cmbCate.TabIndex = 89; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(212, 89); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(29, 12); + label5.TabIndex = 88; + label5.Text = "분류"; // // fProjectData // @@ -1589,5 +1617,6 @@ private System.Windows.Forms.ToolStripButton btwEdit; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.ComboBox cmbCate; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 14cdda7..2d82b9c 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -37,6 +37,12 @@ namespace FPJ0000 this.cmbProcess.ValueMember = "Value"; this.cmbProcess.DataSource = dt_eetproc; + //분류 - 190903 + var dt_cate = FCOMMON.DBM.getCodeTable("20"); + this.cmbCate.DisplayMember = "Value"; + this.cmbCate.ValueMember = "Value"; + this.cmbCate.DataSource = dt_cate; + //공정 var dt_status = FCOMMON.DBM.getCodeTable("01"); this.cmbState.DisplayMember = "Value"; @@ -66,6 +72,7 @@ namespace FPJ0000 this.cmbProcess.Text = dr.process; this.cmbState.Text = dr.status; this.cmbPart.Text = dr.part; + this.cmbCate.Text = dr.category; //신규데이터는 추가정보를 바로 저장할 수 없다. if(dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) @@ -97,6 +104,7 @@ namespace FPJ0000 this.dr.process = cmbProcess.Text; this.dr.status = cmbState.Text; this.dr.part = cmbPart.Text; + this.dr.category = cmbCate.Text; this.Validate(); this.bs.EndEdit(); diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 891f254..b460c2d 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -183,12 +183,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 @@ -329,11 +323,8 @@ 449, 17 - - 449, 17 - - - 773, 17 + + False 773, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 3be41c9..b73bb93 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,24 +30,24 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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 textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -90,7 +90,6 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -107,6 +106,7 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); @@ -139,20 +139,20 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); this.tableLayoutPanel2.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -514,170 +514,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 18; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Status"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Part"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Process"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Requestor"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Project\r\nChampion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Co Workers"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Project"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "History"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Remark"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType21.DecimalPlaces = 0; - numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType21.MaximumValue = 2147483647D; - numberCellType21.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType21; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType53; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType54; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType55; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType56; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType57; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType58; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType59; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType60; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType61; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType62; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - numberCellType22.DecimalPlaces = 0; - numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType22.MaximumValue = 2147483647D; - numberCellType22.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType22; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F; - numberCellType23.MaximumValue = 999999999999999D; - numberCellType23.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType23; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType24.MaximumValue = 999999999999999D; - numberCellType24.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType24; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - 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)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType25.MaximumValue = 999999999999999D; - numberCellType25.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType25; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType63; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType64; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "lasthistory"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType65; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); @@ -828,6 +664,16 @@ this.btSearch.Text = "새로고침(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // btViewDel // this.btViewDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -1212,15 +1058,169 @@ this.panel3.Size = new System.Drawing.Size(1384, 218); this.panel3.TabIndex = 7; // - // toolStripButton2 + // fpSpread1_Sheet1 // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - 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(65, 34); - this.toolStripButton2.Text = "닫기"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 18; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "협업"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).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(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "userhw2"; + 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(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 59F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + 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))))); + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fProjectList // @@ -1242,7 +1242,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1251,6 +1250,7 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); this.tableLayoutPanel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1348,7 +1348,7 @@ private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton2; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index a1687d8..8ea875b 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -208,9 +208,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - 387, 17 @@ -260,7 +257,7 @@ 248, 17 - 828, 17 + 17, 56 455, 17 @@ -407,16 +404,10 @@ 561, 17 - - 561, 17 - 731, 17 647, 17 - - 731, 17 - \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 3b926eb..6e0d8bd 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -571,6 +571,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columngcode; + private global::System.Data.DataColumn columncategory; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() : @@ -893,6 +895,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn categoryColumn { + get { + return this.columncategory; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -964,7 +974,8 @@ namespace FPJ0000 { string userhw2, string orderno, string lasthistory, - string gcode) { + string gcode, + string category) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1001,7 +1012,8 @@ namespace FPJ0000 { userhw2, orderno, lasthistory, - gcode}; + gcode, + category}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1042,7 +1054,8 @@ namespace FPJ0000 { string userhw2, string orderno, string lasthistory, - string gcode) { + string gcode, + string category) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1079,7 +1092,8 @@ namespace FPJ0000 { userhw2, orderno, lasthistory, - gcode}; + gcode, + category}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1144,6 +1158,7 @@ namespace FPJ0000 { this.columnorderno = base.Columns["orderno"]; this.columnlasthistory = base.Columns["lasthistory"]; this.columngcode = base.Columns["gcode"]; + this.columncategory = base.Columns["category"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1219,6 +1234,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnlasthistory); this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); + this.columncategory = new global::System.Data.DataColumn("category", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncategory); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1253,7 +1270,9 @@ namespace FPJ0000 { this.columnorderno.MaxLength = 50; this.columnlasthistory.ReadOnly = true; this.columnlasthistory.MaxLength = 200; + this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; + this.columncategory.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4646,18 +4665,29 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string gcode { get { - if (this.IsgcodeNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tableProjects.gcodeColumn])); - } + return ((string)(this[this.tableProjects.gcodeColumn])); } set { this[this.tableProjects.gcodeColumn] = value; } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string category { + get { + if (this.IscategoryNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.categoryColumn])); + } + } + set { + this[this.tableProjects.categoryColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -5032,14 +5062,14 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsgcodeNull() { - return this.IsNull(this.tableProjects.gcodeColumn); + public bool IscategoryNull() { + return this.IsNull(this.tableProjects.categoryColumn); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetgcodeNull() { - this[this.tableProjects.gcodeColumn] = global::System.Convert.DBNull; + public void SetcategoryNull() { + this[this.tableProjects.categoryColumn] = global::System.Convert.DBNull; } } @@ -7447,6 +7477,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("orderno", "orderno"); tableMapping.ColumnMappings.Add("lasthistory", "lasthistory"); tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("category", "category"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -7457,8 +7488,8 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, gcode) -VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode); + progress, import, asset, isdel, path, userhw2, orderno, gcode, category) +VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7472,7 +7503,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7493,14 +7524,15 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, - orderno = @orderno -WHERE (idx = @Original_idx); + orderno = @orderno, category = @category +WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7514,7 +7546,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7534,6 +7566,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 300, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -7552,7 +7585,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -7571,7 +7604,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -7579,7 +7612,7 @@ WHERE (idx = @idx)"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)"; @@ -7607,7 +7640,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username)); } if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode)); @@ -7638,7 +7671,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username)); } if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode)); @@ -7687,7 +7720,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); @@ -7712,7 +7745,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); @@ -7809,7 +7842,8 @@ WHERE (ISNULL(name, N'') LIKE @search OR string path, string userhw2, string orderno, - string gcode) { + string gcode, + string category) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -7992,11 +8026,17 @@ WHERE (ISNULL(name, N'') LIKE @search OR this.Adapter.InsertCommand.Parameters[30].Value = ((string)(orderno)); } if ((gcode == null)) { - this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.InsertCommand.Parameters[31].Value = ((string)(gcode)); } + if ((category == null)) { + this.Adapter.InsertCommand.Parameters[32].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[32].Value = ((string)(category)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8049,6 +8089,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR string path, string userhw2, string orderno, + string category, int Original_idx, int idx) { if ((status == null)) { @@ -8232,8 +8273,14 @@ WHERE (ISNULL(name, N'') LIKE @search OR else { this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(orderno)); } - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(idx)); + if ((category == null)) { + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(category)); + } + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8256,7 +8303,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR public virtual int DeleteImport(string gcode) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; if ((gcode == null)) { - command.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { command.Parameters[0].Value = ((string)(gcode)); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 9a1d0a9..96c58ed 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -9,7 +9,7 @@ - + UPDATE Projects @@ -24,49 +24,50 @@ WHERE (idx = @Original_idx) INSERT INTO Projects (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, gcode) -VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode); + progress, import, asset, isdel, path, userhw2, orderno, gcode, category) +VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -74,55 +75,56 @@ WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - + - + - + UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, - orderno = @orderno -WHERE (idx = @Original_idx); + orderno = @orderno, category = @category +WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -163,6 +165,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -177,7 +180,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat DELETE FROM Projects WHERE (import = 1) AND (gcode = @gcode) - + @@ -186,11 +189,11 @@ WHERE (import = 1) AND (gcode = @gcode) SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (idx = @idx) - + @@ -199,13 +202,13 @@ WHERE (idx = @idx) SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) - + @@ -1073,7 +1076,7 @@ WHERE (pidx = @pidx) - + @@ -1242,17 +1245,24 @@ WHERE (pidx = @pidx) - + + + + + + + + - + @@ -1296,7 +1306,7 @@ WHERE (pidx = @pidx) - + @@ -1341,7 +1351,7 @@ WHERE (pidx = @pidx) - + @@ -1449,7 +1459,7 @@ WHERE (pidx = @pidx) - + @@ -1560,7 +1570,7 @@ WHERE (pidx = @pidx) - + @@ -1594,7 +1604,7 @@ WHERE (pidx = @pidx) - +