diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index fc39b92..f2f9c54 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("23.07.31.1700")] -[assembly: AssemblyFileVersion("23.07.31.1700")] +[assembly: AssemblyVersion("23.08.02.1530")] +[assembly: AssemblyFileVersion("23.08.02.1530")] diff --git a/Project/_Common/fAddNewUser.Designer.cs b/Project/_Common/fAddNewUser.Designer.cs index 859398e..abcf97a 100644 --- a/Project/_Common/fAddNewUser.Designer.cs +++ b/Project/_Common/fAddNewUser.Designer.cs @@ -59,12 +59,12 @@ this.tbNameE = new System.Windows.Forms.TextBox(); this.tbKJPath = new System.Windows.Forms.TextBox(); this.tbProcess = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.tbState = new System.Windows.Forms.TextBox(); this.chkJobReport = new System.Windows.Forms.CheckBox(); this.chkUseState = new System.Windows.Forms.CheckBox(); this.chkExceptHoly = new System.Windows.Forms.CheckBox(); + this.btChangePW = new System.Windows.Forms.Button(); idLabel = new System.Windows.Forms.Label(); passwordLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label(); @@ -337,16 +337,6 @@ this.tbProcess.Size = new System.Drawing.Size(189, 29); this.tbProcess.TabIndex = 30; // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(105, 45); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(200, 29); - this.textBox1.TabIndex = 31; - this.textBox1.Text = "기본값 0"; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // button1 // this.button1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -386,27 +376,38 @@ this.chkUseState.Text = "계정사용"; this.chkUseState.UseVisualStyleBackColor = true; // - // checkBox1 + // chkExceptHoly // this.chkExceptHoly.AutoSize = true; this.chkExceptHoly.Location = new System.Drawing.Point(311, 260); - this.chkExceptHoly.Name = "checkBox1"; + this.chkExceptHoly.Name = "chkExceptHoly"; this.chkExceptHoly.Size = new System.Drawing.Size(93, 25); this.chkExceptHoly.TabIndex = 38; this.chkExceptHoly.Text = "휴가제외"; this.chkExceptHoly.UseVisualStyleBackColor = true; // + // btChangePW + // + this.btChangePW.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btChangePW.Location = new System.Drawing.Point(105, 46); + this.btChangePW.Name = "btChangePW"; + this.btChangePW.Size = new System.Drawing.Size(200, 29); + this.btChangePW.TabIndex = 39; + this.btChangePW.Text = "기본값 \"0\""; + this.btChangePW.UseVisualStyleBackColor = true; + this.btChangePW.Click += new System.EventHandler(this.btChangePW_Click); + // // fAddNewUser // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(601, 355); + this.Controls.Add(this.btChangePW); this.Controls.Add(this.chkExceptHoly); this.Controls.Add(this.chkUseState); this.Controls.Add(this.chkJobReport); this.Controls.Add(label6); this.Controls.Add(this.tbState); this.Controls.Add(this.button1); - this.Controls.Add(this.textBox1); this.Controls.Add(label5); this.Controls.Add(this.tbProcess); this.Controls.Add(label4); @@ -464,11 +465,11 @@ private System.Windows.Forms.TextBox tbNameE; private System.Windows.Forms.TextBox tbKJPath; private System.Windows.Forms.TextBox tbProcess; - private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox tbState; private System.Windows.Forms.CheckBox chkJobReport; private System.Windows.Forms.CheckBox chkUseState; private System.Windows.Forms.CheckBox chkExceptHoly; + private System.Windows.Forms.Button btChangePW; } } diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs index b2cc915..0e43b95 100644 --- a/Project/_Common/fAddNewUser.cs +++ b/Project/_Common/fAddNewUser.cs @@ -29,7 +29,7 @@ namespace Project._Common { tbId.Enabled = false; button1.Enabled = false; - textBox1.Enabled = false; + btChangePW.Enabled = true; var db = new EEEntitiesMain(); @@ -62,7 +62,11 @@ namespace Project._Common this.Text = "사용자 정보 변경"; } - else this.Text = "사용자 정보 추가"; + else + { + this.Text = "사용자 정보 추가"; + btChangePW.Enabled = false; + } } @@ -180,7 +184,7 @@ namespace Project._Common drUser.gcode = gcode; drUser.level = 1; drUser.id = tbId.Text.Trim(); - drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0 + drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0 drUser.name = tbNameK.Text.Trim(); drUser.nameE = tbNameE.Text.Trim(); @@ -198,7 +202,9 @@ namespace Project._Common else { - if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; + if(string.IsNullOrEmpty(drUser.password)) + drUser.password = newpassword;// "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; + drUser.name = tbNameK.Text.Trim(); drUser.nameE = tbNameE.Text.Trim(); drUser.dept = this.tbDept.Text.Trim(); @@ -220,7 +226,7 @@ namespace Project._Common } catch (Exception ex) { - FCOMMON.Util.MsgE("save error\n"+ex.Message); + FCOMMON.Util.MsgE("save error\n" + ex.Message); } @@ -234,5 +240,37 @@ namespace Project._Common private void chkJobReport_CheckedChanged(object sender, EventArgs e) { } + + string newpassword = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값 0 + private void btChangePW_Click(object sender, EventArgs e) + { + var f = new fNewPassword(this.tbId.Text); + if (f.ShowDialog() == DialogResult.OK) + { + var opass = Pub.MakePasswordEnc( f.tbPassO.Text); + + //해당 그룹에 해당 사용자가 존재하는지 확이한다. + var gcode = FCOMMON.info.Login.gcode; + var uid = tbId.Text; + var db = new EEEntitiesMain(); + var drUser = db.Users.SingleOrDefault(t => t.id == uid); + if (drUser != null) + { + if (opass.Equals(drUser.password)==false) + { + Util.MsgE("기존 암호가 일치하지 않습니다"); + return; + } + } + else { + Util.MsgE("사용자 정보가 없어 처리할 수 없습니다"); + return; + } + + + newpassword = Pub.MakePasswordEnc(f.newpassword); + Util.MsgI($"암호가 변경되었습니다.[저장] 버튼을 누르면 적용 됩니다"); + } + } } } diff --git a/Project/_Common/fNewPassword.cs b/Project/_Common/fNewPassword.cs index 22830a9..4ab034d 100644 --- a/Project/_Common/fNewPassword.cs +++ b/Project/_Common/fNewPassword.cs @@ -11,6 +11,7 @@ namespace Project._Common { public partial class fNewPassword : Form { + public string newpassword { get; set; } public fNewPassword(string userid) { InitializeComponent(); @@ -19,7 +20,7 @@ namespace Project._Common private void fNewPassword_Load(object sender, EventArgs e) { - + newpassword = string.Empty; } private void button1_Click(object sender, EventArgs e) @@ -49,6 +50,7 @@ namespace Project._Common tbPass2.SelectAll(); return; } + newpassword = tbPass1.Text.Trim(); DialogResult = System.Windows.Forms.DialogResult.OK; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index 21e66de..9edefde 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -139,8 +139,8 @@ this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.label1 = new System.Windows.Forms.Label(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -821,18 +821,6 @@ this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 644); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1284, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -1131,6 +1119,18 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 644); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1284, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fPurchaseNR // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 4790ee0..013e06e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs @@ -123,10 +123,12 @@ namespace FEQ0000 if (curLevel >= 5) { btSave.Visible = true; + 엑셀에서가져오기ToolStripMenuItem.Visible = true; } else { + 엑셀에서가져오기ToolStripMenuItem.Visible = false; btSave.Visible = false; btViewDel.Visible = false; fpSpread1.EditMode = false; @@ -342,7 +344,7 @@ namespace FEQ0000 { this.Validate(); this.bs.EndEdit(); - + try { var cnt = this.tam.UpdateAll(this.dsPurchase); @@ -1050,7 +1052,7 @@ namespace FEQ0000 private void 엑셀에서가져오기ToolStripMenuItem_Click(object sender, EventArgs e) { - var f = new fPurchase_excelimport(); + var f = new fPurchase_excelimport(false); f.Show(); } @@ -1305,7 +1307,7 @@ namespace FEQ0000 { //state 가 ---인 데이터를 기준으로 함 //chk2 ==false 인 자료를 기준으로 함 - var newlist = this.dsPurchase.Purchase.Where(t => (t.Ischk2Null() || t.chk2==false) && t.state.Equals("---")).ToList(); + var newlist = this.dsPurchase.Purchase.Where(t => (t.Ischk2Null() || t.chk2 == false) && t.state.Equals("---")).ToList(); if (newlist.Any() == false) { FCOMMON.Util.MsgE($"신규 신청 데이터가 없습니다"); @@ -1315,10 +1317,10 @@ namespace FEQ0000 if (f.ShowDialog() == DialogResult.OK) { var cnt = 0; - foreach(var idx in f.chklist) + foreach (var idx in f.chklist) { var dr = newlist.Where(t => t.idx == idx).FirstOrDefault(); - if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); } + if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); } } FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx index da5a465..d9e0191 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/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 @@ -147,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/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 @@ -176,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/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 @@ -211,7 +211,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -439,14 +439,14 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZDdSgJBGIa9kY67hK6gdFXyB7oJbyIiiPUv - obMysjqrDoWik+jXGbeO6kACQ/IwDJSCLKPJd9gVk8l1ncWNmAdeZme+l/FxfIp/j18nTCbBFH2LZYxj - f/JyGvfNLRtT8ZxxhHNR30l6gjI0Xt5ZoVTrzOvl1uwSmQlnLpoFUuvgXAbXBC24ZJo+YTWPpHBdEC8W - SlO+uoHrgsDtu5SgDJ4Jbp3WWSRbZoWzunkixjPB6KrBe1iH4ZkgXg5y23/1BUdFCYrAvD/DwHzigsCS - s+tirgRFWHJ2XcyVoAhLzq6LuRIUYcnZdTFXgoNYYv35DcwmLugEJSiLEpRFCcryQ1A2C2s3bP3kkX9j - xX6wM056gofVL6ns37VZYqfCL03sVthBdy/qOUlPMLRSft6kLWHJSfZu2/xSyIrmTpLv+miZ8wYXDCRJ - EJK4fNwM/kH8gKg3aiCn6UTjgrIEUqVYNHf1mqdNVrz/ZBukySLdvZakUbPiPUGdxOdT1w+BxeJHOEur - kDZHCo/x+b4B46ykjDKzsxIAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZDdSgJBGIa9kY67hK6gdFX8g27Cm4gIYjVN + 6KyMrM6qs4Kik+jXGbeO6kACQ/IwDJSCLKPJd9gVk8l1ncWNmAdeZme+l/FxfIp/j18nTCbBNH2LZ4xj + f+pyEvfNLBgTiZxxhHNR30m6gjLUX95ZoVhtR/RSc3qeTIUzF40CqbZxLoNrghZccok+YTWPpHBdEC8W + WqJ8dQPXBYHbdylBGTwT3DitsWi2xApnNfNEjGeCsWWD97AOwjNBvBzkNv/qCw6LEhSBeW8GgfnYBYEl + Z9fFXAmKsOTsupgrQRGWnF0XcyUowpKz62KuBPuxxHrzG5iNXdAJSlAWJSiLEpTlh6BsZldu2OrJI//G + in1/Z5R0BQ8rX1LZvWux5FaZX5rcLrO9zl7Uc5KuYGix9LxOm8KSk+zctvilkBXNnSTf8dEy53UuGEiR + ICRx+ajp/4P4AVFv2EBO04nGBWUJpIvxWO7qNU8b7OD+k62RBot29lqKxsyK9wR1koikrx8Cc/sf4Syt + QNocKTzG5/sG4hiki22pPhYAAAAASUVORK5CYII= diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 9a634c8..e90683e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -56,6 +56,7 @@ namespace FEQ0000 private void __Load(object sender, EventArgs e) { advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); + tbPumName.ImeMode = ImeMode.Alpha; //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); @@ -256,10 +257,17 @@ namespace FEQ0000 } binit = true; + if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + { sidchk1 = string.Empty; + dbchk1 = string.Empty; + } else - sidchk1 = tbSID.Text.Trim(); + { + sidchk1 = tbSID.Text; + dbchk1 = tbPumName.Text; + } timer1.Start(); @@ -324,6 +332,7 @@ namespace FEQ0000 if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { dbchk1 = f.itemName; + sidchk1 = string.Empty; //인덱스값이 다르면 모델 및 가격을 업데이트 한다. tbPumName.Text = f.itemName; @@ -909,7 +918,7 @@ namespace FEQ0000 private void button1_Click_1(object sender, EventArgs e) { - Lov_Item("", true); + Lov_Item(tbPumName.Text, true); } private void button2_Click_1(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs index 1a144e0..7aadd2d 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs @@ -30,18 +30,17 @@ { this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label stateLabel; - System.Windows.Forms.Label processLabel; - System.Windows.Forms.Label label22; - System.Windows.Forms.Label label23; - System.Windows.Forms.Label assetLabel; System.Windows.Forms.Label label15; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase_excelimport)); + this.processLabel = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.assetLabel = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.bs = new System.Windows.Forms.BindingSource(this.components); + this.bsNR = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FEQ0000.dsPurchase(); this.panel1 = new System.Windows.Forms.Panel(); - this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.label16 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.nudE = new System.Windows.Forms.NumericUpDown(); @@ -49,6 +48,7 @@ this.label2 = new System.Windows.Forms.Label(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -65,6 +65,11 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.sbSum = new System.Windows.Forms.ToolStripLabel(); this.panel2 = new System.Windows.Forms.Panel(); + this.linkLabel3 = new System.Windows.Forms.LinkLabel(); + this.nudLine = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.nudCost = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); this.nudPdate = new System.Windows.Forms.NumericUpDown(); this.label25 = new System.Windows.Forms.Label(); this.nudInDate = new System.Windows.Forms.NumericUpDown(); @@ -96,7 +101,7 @@ this.nudSc = new System.Windows.Forms.NumericUpDown(); this.label10 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.taNR = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); this.panel3 = new System.Windows.Forms.Panel(); this.tbProject = new System.Windows.Forms.ComboBox(); this.cbManuProc = new System.Windows.Forms.ComboBox(); @@ -122,17 +127,17 @@ this.columnHeader13 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader16 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader15 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader17 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader18 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.전체선택ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.모두해제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.선택반전ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bsCR = new System.Windows.Forms.BindingSource(this.components); + this.taCR = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); stateLabel = new System.Windows.Forms.Label(); - processLabel = new System.Windows.Forms.Label(); - label22 = new System.Windows.Forms.Label(); - label23 = new System.Windows.Forms.Label(); - assetLabel = new System.Windows.Forms.Label(); label15 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsNR)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudE)).BeginInit(); @@ -141,6 +146,8 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudLine)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCost)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudPdate)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudInDate)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudReq)).BeginInit(); @@ -158,6 +165,7 @@ ((System.ComponentModel.ISupportInitialize)(this.nudSc)).BeginInit(); this.panel3.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bsCR)).BeginInit(); this.SuspendLayout(); // // stateLabel @@ -171,39 +179,39 @@ // // processLabel // - processLabel.AutoSize = true; - processLabel.Location = new System.Drawing.Point(40, 33); - processLabel.Name = "processLabel"; - processLabel.Size = new System.Drawing.Size(29, 12); - processLabel.TabIndex = 57; - processLabel.Text = "공정"; + this.processLabel.AutoSize = true; + this.processLabel.Location = new System.Drawing.Point(40, 33); + this.processLabel.Name = "processLabel"; + this.processLabel.Size = new System.Drawing.Size(29, 12); + this.processLabel.TabIndex = 57; + this.processLabel.Text = "공정"; // // label22 // - label22.AutoSize = true; - label22.Location = new System.Drawing.Point(482, 33); - label22.Name = "label22"; - label22.Size = new System.Drawing.Size(65, 12); - label22.TabIndex = 63; - label22.Text = "장비제조사"; + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(482, 33); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(65, 12); + this.label22.TabIndex = 63; + this.label22.Text = "장비제조사"; // // label23 // - label23.AutoSize = true; - label23.Location = new System.Drawing.Point(276, 33); - label23.Name = "label23"; - label23.Size = new System.Drawing.Size(53, 12); - label23.TabIndex = 65; - label23.Text = "제조공정"; + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(276, 33); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(53, 12); + this.label23.TabIndex = 65; + this.label23.Text = "제조공정"; // // assetLabel // - assetLabel.AutoSize = true; - assetLabel.Location = new System.Drawing.Point(677, 33); - assetLabel.Name = "assetLabel"; - assetLabel.Size = new System.Drawing.Size(53, 12); - assetLabel.TabIndex = 61; - assetLabel.Text = "장비모델"; + this.assetLabel.AutoSize = true; + this.assetLabel.Location = new System.Drawing.Point(677, 33); + this.assetLabel.Name = "assetLabel"; + this.assetLabel.Size = new System.Drawing.Size(53, 12); + this.assetLabel.TabIndex = 61; + this.assetLabel.Text = "장비모델"; // // label15 // @@ -220,7 +228,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(92, 30); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(503, 21); + this.textBox1.Size = new System.Drawing.Size(783, 21); this.textBox1.TabIndex = 1; // // linkLabel1 @@ -235,10 +243,10 @@ this.linkLabel1.Text = "파일 선택"; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // - // bs + // bsNR // - this.bs.DataMember = "Purchase"; - this.bs.DataSource = this.dsPRJ; + this.bsNR.DataMember = "Purchase"; + this.bsNR.DataSource = this.dsPRJ; // // dsPRJ // @@ -248,7 +256,6 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); - this.panel1.Controls.Add(this.linkLabel2); this.panel1.Controls.Add(this.label16); this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.nudE); @@ -262,21 +269,9 @@ this.panel1.ForeColor = System.Drawing.Color.White; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(994, 57); + this.panel1.Size = new System.Drawing.Size(1184, 57); this.panel1.TabIndex = 0; // - // linkLabel2 - // - this.linkLabel2.AutoSize = true; - this.linkLabel2.LinkColor = System.Drawing.Color.DeepSkyBlue; - this.linkLabel2.Location = new System.Drawing.Point(601, 35); - this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.Size = new System.Drawing.Size(77, 12); - this.linkLabel2.TabIndex = 53; - this.linkLabel2.TabStop = true; - this.linkLabel2.Text = "샘플파일열기"; - this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); - // // label16 // this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); @@ -284,7 +279,7 @@ this.label16.ForeColor = System.Drawing.Color.WhiteSmoke; this.label16.Location = new System.Drawing.Point(0, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(994, 23); + this.label16.Size = new System.Drawing.Size(1184, 23); this.label16.TabIndex = 52; this.label16.Text = "엑셀 파일 설정"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -292,7 +287,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(925, 34); + this.label3.Location = new System.Drawing.Point(1115, 34); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(14, 12); this.label3.TabIndex = 10; @@ -300,7 +295,7 @@ // // nudE // - this.nudE.Location = new System.Drawing.Point(944, 30); + this.nudE.Location = new System.Drawing.Point(1134, 30); this.nudE.Maximum = new decimal(new int[] { 65535, 0, @@ -323,7 +318,7 @@ // // nudS // - this.nudS.Location = new System.Drawing.Point(876, 30); + this.nudS.Location = new System.Drawing.Point(1066, 30); this.nudS.Maximum = new decimal(new int[] { 65535, 0, @@ -347,7 +342,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(825, 34); + this.label2.Location = new System.Drawing.Point(1015, 34); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(45, 12); this.label2.TabIndex = 7; @@ -355,7 +350,7 @@ // // numericUpDown1 // - this.numericUpDown1.Location = new System.Drawing.Point(758, 30); + this.numericUpDown1.Location = new System.Drawing.Point(948, 30); this.numericUpDown1.Maximum = new decimal(new int[] { 10, 0, @@ -379,16 +374,28 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(691, 34); + this.label1.Location = new System.Drawing.Point(881, 34); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 2; this.label1.Text = "시트번호"; // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.LinkColor = System.Drawing.Color.DeepSkyBlue; + this.linkLabel2.Location = new System.Drawing.Point(1101, 33); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(77, 12); + this.linkLabel2.TabIndex = 53; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "샘플파일열기"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); + // // bn // this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; + this.bn.BindingSource = this.bsNR; this.bn.CountItem = this.bindingNavigatorCountItem; this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -414,7 +421,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(994, 28); + this.bn.Size = new System.Drawing.Size(1184, 28); this.bn.TabIndex = 2; this.bn.Text = "bindingNavigator1"; // @@ -452,6 +459,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -525,6 +533,12 @@ // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(120)))), ((int)(((byte)(120))))); this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.linkLabel3); + this.panel2.Controls.Add(this.linkLabel2); + this.panel2.Controls.Add(this.nudLine); + this.panel2.Controls.Add(this.label12); + this.panel2.Controls.Add(this.nudCost); + this.panel2.Controls.Add(this.label18); this.panel2.Controls.Add(this.nudPdate); this.panel2.Controls.Add(this.label25); this.panel2.Controls.Add(this.nudInDate); @@ -560,39 +574,91 @@ this.panel2.ForeColor = System.Drawing.Color.White; this.panel2.Location = new System.Drawing.Point(0, 57); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(994, 86); + this.panel2.Size = new System.Drawing.Size(1184, 88); this.panel2.TabIndex = 3; this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); // + // linkLabel3 + // + this.linkLabel3.AutoSize = true; + this.linkLabel3.LinkColor = System.Drawing.Color.DeepSkyBlue; + this.linkLabel3.Location = new System.Drawing.Point(1113, 56); + this.linkLabel3.Name = "linkLabel3"; + this.linkLabel3.Size = new System.Drawing.Size(65, 12); + this.linkLabel3.TabIndex = 72; + this.linkLabel3.TabStop = true; + this.linkLabel3.Text = "번호초기화"; + this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); + // + // nudLine + // + this.nudLine.Location = new System.Drawing.Point(825, 58); + this.nudLine.Name = "nudLine"; + this.nudLine.Size = new System.Drawing.Size(45, 21); + this.nudLine.TabIndex = 71; + this.nudLine.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudLine.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(756, 62); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(63, 12); + this.label12.TabIndex = 70; + this.label12.Text = "Line Code"; + // + // nudCost + // + this.nudCost.Location = new System.Drawing.Point(704, 58); + this.nudCost.Name = "nudCost"; + this.nudCost.Size = new System.Drawing.Size(45, 21); + this.nudCost.TabIndex = 69; + this.nudCost.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudCost.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(626, 62); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(72, 12); + this.label18.TabIndex = 68; + this.label18.Text = "Cost Center"; + // // nudPdate // - this.nudPdate.Location = new System.Drawing.Point(776, 29); + this.nudPdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.nudPdate.Location = new System.Drawing.Point(59, 33); this.nudPdate.Name = "nudPdate"; this.nudPdate.Size = new System.Drawing.Size(45, 21); this.nudPdate.TabIndex = 63; this.nudPdate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudPdate.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(727, 33); + this.label25.Location = new System.Drawing.Point(10, 37); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(41, 12); this.label25.TabIndex = 62; this.label25.Text = "요청일"; + this.label25.Click += new System.EventHandler(this.label25_Click); // // nudInDate // - this.nudInDate.Location = new System.Drawing.Point(776, 58); + this.nudInDate.Location = new System.Drawing.Point(473, 58); this.nudInDate.Name = "nudInDate"; this.nudInDate.Size = new System.Drawing.Size(45, 21); this.nudInDate.TabIndex = 61; this.nudInDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudInDate.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(727, 62); + this.label26.Location = new System.Drawing.Point(424, 62); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(41, 12); this.label26.TabIndex = 60; @@ -600,16 +666,17 @@ // // nudReq // - this.nudReq.Location = new System.Drawing.Point(670, 29); + this.nudReq.Location = new System.Drawing.Point(161, 33); this.nudReq.Name = "nudReq"; this.nudReq.Size = new System.Drawing.Size(45, 21); this.nudReq.TabIndex = 59; this.nudReq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudReq.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(621, 33); + this.label17.Location = new System.Drawing.Point(112, 37); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(41, 12); this.label17.TabIndex = 58; @@ -617,16 +684,17 @@ // // nudRecv // - this.nudRecv.Location = new System.Drawing.Point(670, 58); + this.nudRecv.Location = new System.Drawing.Point(575, 58); this.nudRecv.Name = "nudRecv"; this.nudRecv.Size = new System.Drawing.Size(45, 21); this.nudRecv.TabIndex = 57; this.nudRecv.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudRecv.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(621, 62); + this.label20.Location = new System.Drawing.Point(531, 62); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(41, 12); this.label20.TabIndex = 56; @@ -634,16 +702,17 @@ // // nudPo // - this.nudPo.Location = new System.Drawing.Point(359, 58); + this.nudPo.Location = new System.Drawing.Point(161, 58); this.nudPo.Name = "nudPo"; this.nudPo.Size = new System.Drawing.Size(45, 21); this.nudPo.TabIndex = 53; this.nudPo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudPo.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(326, 62); + this.label9.Location = new System.Drawing.Point(129, 62); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(22, 12); this.label9.TabIndex = 52; @@ -651,7 +720,8 @@ // // nudSid // - this.nudSid.Location = new System.Drawing.Point(64, 29); + this.nudSid.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.nudSid.Location = new System.Drawing.Point(263, 33); this.nudSid.Name = "nudSid"; this.nudSid.Size = new System.Drawing.Size(45, 21); this.nudSid.TabIndex = 1; @@ -661,7 +731,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(34, 33); + this.label6.Location = new System.Drawing.Point(232, 37); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(24, 12); this.label6.TabIndex = 0; @@ -669,7 +739,7 @@ // // nudSupplty // - this.nudSupplty.Location = new System.Drawing.Point(64, 58); + this.nudSupplty.Location = new System.Drawing.Point(944, 33); this.nudSupplty.Name = "nudSupplty"; this.nudSupplty.Size = new System.Drawing.Size(45, 21); this.nudSupplty.TabIndex = 23; @@ -679,7 +749,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(5, 62); + this.label5.Location = new System.Drawing.Point(885, 37); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(53, 12); this.label5.TabIndex = 22; @@ -687,7 +757,7 @@ // // nudMemo // - this.nudMemo.Location = new System.Drawing.Point(164, 58); + this.nudMemo.Location = new System.Drawing.Point(59, 58); this.nudMemo.Name = "nudMemo"; this.nudMemo.Size = new System.Drawing.Size(45, 21); this.nudMemo.TabIndex = 25; @@ -697,7 +767,7 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(131, 62); + this.label21.Location = new System.Drawing.Point(26, 62); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(29, 12); this.label21.TabIndex = 24; @@ -705,8 +775,7 @@ // // nudPrice // - this.nudPrice.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.nudPrice.Location = new System.Drawing.Point(460, 29); + this.nudPrice.Location = new System.Drawing.Point(825, 33); this.nudPrice.Name = "nudPrice"; this.nudPrice.Size = new System.Drawing.Size(45, 21); this.nudPrice.TabIndex = 21; @@ -716,7 +785,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(415, 33); + this.label19.Location = new System.Drawing.Point(790, 37); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(29, 12); this.label19.TabIndex = 20; @@ -724,7 +793,7 @@ // // nudCr // - this.nudCr.Location = new System.Drawing.Point(568, 58); + this.nudCr.Location = new System.Drawing.Point(370, 58); this.nudCr.Name = "nudCr"; this.nudCr.Size = new System.Drawing.Size(45, 21); this.nudCr.TabIndex = 11; @@ -734,7 +803,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(519, 62); + this.label7.Location = new System.Drawing.Point(322, 62); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(44, 12); this.label7.TabIndex = 10; @@ -742,7 +811,7 @@ // // nudUnit // - this.nudUnit.Location = new System.Drawing.Point(268, 58); + this.nudUnit.Location = new System.Drawing.Point(704, 33); this.nudUnit.Name = "nudUnit"; this.nudUnit.Size = new System.Drawing.Size(45, 21); this.nudUnit.TabIndex = 19; @@ -752,7 +821,7 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(233, 62); + this.label14.Location = new System.Drawing.Point(669, 37); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(29, 12); this.label14.TabIndex = 18; @@ -761,7 +830,7 @@ // nudPumName // this.nudPumName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.nudPumName.Location = new System.Drawing.Point(164, 29); + this.nudPumName.Location = new System.Drawing.Point(371, 33); this.nudPumName.Name = "nudPumName"; this.nudPumName.Size = new System.Drawing.Size(45, 21); this.nudPumName.TabIndex = 13; @@ -771,7 +840,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(128, 33); + this.label13.Location = new System.Drawing.Point(329, 37); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(29, 12); this.label13.TabIndex = 12; @@ -779,7 +848,7 @@ // // nudScale // - this.nudScale.Location = new System.Drawing.Point(268, 29); + this.nudScale.Location = new System.Drawing.Point(473, 33); this.nudScale.Name = "nudScale"; this.nudScale.Size = new System.Drawing.Size(45, 21); this.nudScale.TabIndex = 15; @@ -789,7 +858,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(233, 33); + this.label4.Location = new System.Drawing.Point(434, 37); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(29, 12); this.label4.TabIndex = 14; @@ -797,8 +866,7 @@ // // nudQty // - this.nudQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.nudQty.Location = new System.Drawing.Point(359, 29); + this.nudQty.Location = new System.Drawing.Point(575, 33); this.nudQty.Name = "nudQty"; this.nudQty.Size = new System.Drawing.Size(45, 21); this.nudQty.TabIndex = 15; @@ -808,7 +876,7 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(324, 33); + this.label11.Location = new System.Drawing.Point(543, 37); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(29, 12); this.label11.TabIndex = 14; @@ -817,17 +885,18 @@ // nudSc // this.nudSc.BackColor = System.Drawing.Color.White; - this.nudSc.Location = new System.Drawing.Point(460, 58); + this.nudSc.Location = new System.Drawing.Point(263, 58); this.nudSc.Name = "nudSc"; this.nudSc.Size = new System.Drawing.Size(45, 21); this.nudSc.TabIndex = 9; this.nudSc.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.nudSc.ValueChanged += new System.EventHandler(this.numericUpDown6_ValueChanged); + this.nudSc.TabIndexChanged += new System.EventHandler(this.nudSc_TabIndexChanged); // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(422, 62); + this.label10.Location = new System.Drawing.Point(234, 62); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(22, 12); this.label10.TabIndex = 8; @@ -840,14 +909,14 @@ this.label8.ForeColor = System.Drawing.Color.WhiteSmoke; this.label8.Location = new System.Drawing.Point(0, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(992, 23); + this.label8.Size = new System.Drawing.Size(1182, 23); this.label8.TabIndex = 51; this.label8.Text = "엑셀/DB 연결 정보 설정 ( A열 = 1)"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // ta + // taNR // - this.ta.ClearBeforeFill = true; + this.taNR.ClearBeforeFill = true; // // panel3 // @@ -858,19 +927,19 @@ this.panel3.Controls.Add(this.cbManuProc); this.panel3.Controls.Add(this.cbEQModel); this.panel3.Controls.Add(this.cbEQManu); - this.panel3.Controls.Add(label22); - this.panel3.Controls.Add(label23); - this.panel3.Controls.Add(assetLabel); + this.panel3.Controls.Add(this.label22); + this.panel3.Controls.Add(this.label23); + this.panel3.Controls.Add(this.assetLabel); this.panel3.Controls.Add(this.cmbState); this.panel3.Controls.Add(stateLabel); this.panel3.Controls.Add(this.cbProcess); - this.panel3.Controls.Add(processLabel); + this.panel3.Controls.Add(this.processLabel); this.panel3.Controls.Add(this.label34); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; this.panel3.ForeColor = System.Drawing.Color.White; - this.panel3.Location = new System.Drawing.Point(0, 143); + this.panel3.Location = new System.Drawing.Point(0, 145); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(994, 82); + this.panel3.Size = new System.Drawing.Size(1184, 82); this.panel3.TabIndex = 4; // // tbProject @@ -947,7 +1016,7 @@ this.label34.ForeColor = System.Drawing.Color.WhiteSmoke; this.label34.Location = new System.Drawing.Point(0, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(992, 23); + this.label34.Size = new System.Drawing.Size(1182, 23); this.label34.TabIndex = 51; this.label34.Text = "구매 등록 정보"; this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -958,8 +1027,6 @@ this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader3, this.columnHeader14, - this.columnHeader1, - this.columnHeader2, this.columnHeader4, this.columnHeader5, this.columnHeader6, @@ -968,18 +1035,22 @@ this.columnHeader9, this.columnHeader10, this.columnHeader11, - this.columnHeader12, this.columnHeader13, + this.columnHeader12, + this.columnHeader1, + this.columnHeader2, this.columnHeader16, - this.columnHeader15}); + this.columnHeader15, + this.columnHeader17, + this.columnHeader18}); this.listView1.ContextMenuStrip = this.contextMenuStrip1; this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; this.listView1.FullRowSelect = true; this.listView1.GridLines = true; this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(0, 225); + this.listView1.Location = new System.Drawing.Point(0, 227); this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(994, 408); + this.listView1.Size = new System.Drawing.Size(1184, 406); this.listView1.TabIndex = 5; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -1056,6 +1127,14 @@ // this.columnHeader15.Text = "수령인"; // + // columnHeader17 + // + this.columnHeader17.Text = "CostCenter"; + // + // columnHeader18 + // + this.columnHeader18.Text = "LineCode"; + // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1086,11 +1165,20 @@ this.선택반전ToolStripMenuItem.Text = "선택 반전"; this.선택반전ToolStripMenuItem.Click += new System.EventHandler(this.선택반전ToolStripMenuItem_Click); // + // bsCR + // + this.bsCR.DataMember = "EETGW_PurchaseCR"; + this.bsCR.DataSource = this.dsPRJ; + // + // taCR + // + this.taCR.ClearBeforeFill = true; + // // fPurchase_excelimport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(994, 661); + this.ClientSize = new System.Drawing.Size(1184, 661); this.Controls.Add(this.listView1); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); @@ -1098,9 +1186,9 @@ this.Controls.Add(this.panel1); this.Name = "fPurchase_excelimport"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "구매내역 가져오기"; + this.Text = "구매내역 가져오기(NR)"; this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsNR)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); @@ -1112,6 +1200,8 @@ this.bn.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudLine)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCost)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudPdate)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudInDate)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudReq)).EndInit(); @@ -1130,6 +1220,7 @@ this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bsCR)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1151,7 +1242,7 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripProgressBar progressBar1; - private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.BindingSource bsNR; private System.Windows.Forms.Label label1; private System.Windows.Forms.NumericUpDown numericUpDown1; private System.Windows.Forms.Label label2; @@ -1177,7 +1268,7 @@ private System.Windows.Forms.Label label16; private System.Windows.Forms.ToolStripButton btSave; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private dsPurchaseTableAdapters.PurchaseTableAdapter ta; + private dsPurchaseTableAdapters.PurchaseTableAdapter taNR; private dsPurchase dsPRJ; private System.Windows.Forms.ToolStripLabel sbSum; private System.Windows.Forms.NumericUpDown nudSupplty; @@ -1227,5 +1318,18 @@ private System.Windows.Forms.ColumnHeader columnHeader14; private System.Windows.Forms.ColumnHeader columnHeader16; private System.Windows.Forms.ColumnHeader columnHeader15; + private System.Windows.Forms.NumericUpDown nudLine; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.NumericUpDown nudCost; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.ColumnHeader columnHeader17; + private System.Windows.Forms.ColumnHeader columnHeader18; + private System.Windows.Forms.LinkLabel linkLabel3; + private System.Windows.Forms.BindingSource bsCR; + private dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter taCR; + private System.Windows.Forms.Label processLabel; + protected System.Windows.Forms.Label label22; + protected System.Windows.Forms.Label label23; + protected System.Windows.Forms.Label assetLabel; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs index b16464d..675aeb7 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs @@ -1,4 +1,5 @@ -using System; +using FCOMMON; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,12 +13,56 @@ namespace FEQ0000 public partial class fPurchase_excelimport : Form { BindingSource bsModel; - public fPurchase_excelimport() + bool crmode = false; + public fPurchase_excelimport(bool cr) { InitializeComponent(); Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; this.FormClosed += __Closed; + crmode = cr; + this.Text = $"구매내역 가져오기({(crmode ? "CR" : "NR")})"; + + if (cr == true) + { + cbProcess.Enabled = false; + cbManuProc.Enabled = false; + cbEQManu.Enabled = false; + cbEQModel.Enabled = false; + assetLabel.Visible = false; + label22.Visible = false; + label23.Visible = false; + processLabel.Visible = false; + } + else + { + //장비제조 + var dt_dept = FCOMMON.DBM.getCodeTable("06"); + BindingSource bsManu = new BindingSource(dt_dept, ""); + this.cbEQManu.DisplayMember = "Value"; + this.cbEQManu.ValueMember = "Value"; + this.cbEQManu.DataSource = bsManu; + + //장비모델 + var dt_asset = FCOMMON.DBM.getCodeTable("07"); + bsModel = new BindingSource(dt_asset, ""); + bsModel.Filter = "svalue='그런거없다'"; + this.cbEQModel.DisplayMember = "Value"; + this.cbEQModel.ValueMember = "Value"; + this.cbEQModel.DataSource = bsModel; + + //제조공정 + var dt_manuproc = FCOMMON.DBM.getCodeTable("08"); + this.cbManuProc.DisplayMember = "Value"; + this.cbManuProc.ValueMember = "Value"; + this.cbManuProc.DataSource = dt_manuproc; + + //장비기술공정 + var dt_eetproc = FCOMMON.DBM.getCodeTable("09"); + this.cbProcess.DisplayMember = "Value"; + this.cbProcess.ValueMember = "Value"; + this.cbProcess.DataSource = dt_eetproc; + } } private void __Load(object sender, EventArgs e) @@ -28,72 +73,21 @@ namespace FEQ0000 this.cmbState.ValueMember = "Value"; this.cmbState.DataSource = stateList; - - //장비제조 - var dt_dept = FCOMMON.DBM.getCodeTable("06"); - BindingSource bsManu = new BindingSource(dt_dept, ""); - this.cbEQManu.DisplayMember = "Value"; - this.cbEQManu.ValueMember = "Value"; - this.cbEQManu.DataSource = bsManu; - - //장비모델 - var dt_asset = FCOMMON.DBM.getCodeTable("07"); - bsModel = new BindingSource(dt_asset, ""); - bsModel.Filter = "svalue='그런거없다'"; - this.cbEQModel.DisplayMember = "Value"; - this.cbEQModel.ValueMember = "Value"; - this.cbEQModel.DataSource = bsModel; - - //제조공정 - var dt_manuproc = FCOMMON.DBM.getCodeTable("08"); - this.cbManuProc.DisplayMember = "Value"; - this.cbManuProc.ValueMember = "Value"; - this.cbManuProc.DataSource = dt_manuproc; - - //장비기술공정 - var dt_eetproc = FCOMMON.DBM.getCodeTable("09"); - this.cbProcess.DisplayMember = "Value"; - this.cbProcess.ValueMember = "Value"; - this.cbProcess.DataSource = dt_eetproc; - - //string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no); - //if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)"; - //this.cmbRequest.Items.Clear(); - //this.cmbRequest.Items.Add(namestr); - //try - //{ - // var cn = FCOMMON.DBM.getCn(); - // cn.Open(); - // string sql = "select [id],[name] " + - // " from users" + - // " where gcode='{1}' and id <> '{0}'" + - // " order by [name]"; - // sql = string.Format(sql, FCOMMON.info.Login.no, FCOMMON.info.Login.gcode); - // var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); - // var rdr = cmd.ExecuteReader(); - // while (rdr.Read()) - // { - // string cmbdata = string.Format("{1}({0})", rdr[0].ToString(), rdr[1].ToString()); - // this.cmbRequest.Items.Add(cmbdata); - // } - // cmd.Dispose(); - // cn.Close(); - // cn.Dispose(); - //} - //catch (Exception ex) - //{ - // FCOMMON.Util.MsgE("User List Error\n\n" + ex.Message); - //} - //cmbRequest.Text = namestr;// FCOMMON.info.Login.nameK; - - //dtPdate.Value = DateTime.Now; loadsetting(this); - textBox1.Text = FCOMMON.Setting.system.Xml.get_Data(this.Name, "FILE"); + + if (crmode) + textBox1.Text = FCOMMON.Setting.system.Xml.get_Data(this.Name, "FILE_CR"); + else + textBox1.Text = FCOMMON.Setting.system.Xml.get_Data(this.Name, "FILE_NR"); cmbState.Text = "PO"; //po에서 변경 200423 - JBS요청 + + //기준값이 없다면 기본값으로 설정한다 + if (nudPumName.Value == 0 && nudSid.Value == 0 && nudPdate.Value == 0) + linkLabel3_LinkClicked(null, null); } void __Closed(object sender, FormClosedEventArgs e) @@ -119,6 +113,7 @@ namespace FEQ0000 { var nud = ctrls.Parent as NumericUpDown; var section = "input_" + this.Name; + if (crmode) section += "_CR"; var value = FCOMMON.Setting.system.Xml.get_Data(section, "nud_" + nud.Name, "0"); var n = decimal.Parse(value); if (n >= nud.Minimum) nud.Value = decimal.Parse(value); @@ -141,6 +136,7 @@ namespace FEQ0000 { var nud = ctrls.Parent as NumericUpDown; var section = "input_" + this.Name; + if (crmode) section += "_CR"; FCOMMON.Setting.system.Xml.set_Data(section, "nud_" + nud.Name, nud.Value.ToString()); } } @@ -221,48 +217,67 @@ namespace FEQ0000 var itemCount = 0; foreach (ListViewItem lv in this.listView1.Items) { - var dr = lv.Tag as dsPurchase.PurchaseRow; - if (lv.Checked == false) dr.AcceptChanges(); + if (crmode) + { + var dr = lv.Tag as dsPurchase.EETGW_PurchaseCRRow; + if (lv.Checked == false) dr.AcceptChanges(); + else + { + itemCount += 1; + // dr.request = userNo; + dr.asset = cbEQModel.Text; + dr.dept = cbEQManu.Text; + dr.manuproc = cbManuProc.Text; + dr.process = cbProcess.Text.Trim(); + dr.state = cmbState.Text.Trim(); + // dr.pdate = dtPdate.Value.ToShortDateString(); + dr.project = tbProject.Text.Trim(); + dr.AcceptChanges(); + dr.SetAdded(); + itemAmt += dr.pumamt; + } + } else { - itemCount += 1; - // dr.request = userNo; - dr.asset = cbEQModel.Text; - dr.dept = cbEQManu.Text; - dr.manuproc = cbManuProc.Text; - dr.process = cbProcess.Text.Trim(); - dr.state = cmbState.Text.Trim(); - // dr.pdate = dtPdate.Value.ToShortDateString(); - dr.project = tbProject.Text.Trim(); - dr.AcceptChanges(); - dr.SetAdded(); - itemAmt += dr.pumamt; + var dr = lv.Tag as dsPurchase.PurchaseRow; + if (lv.Checked == false) dr.AcceptChanges(); + else + { + itemCount += 1; + // dr.request = userNo; + dr.asset = cbEQModel.Text; + dr.dept = cbEQManu.Text; + dr.manuproc = cbManuProc.Text; + dr.process = cbProcess.Text.Trim(); + dr.state = cmbState.Text.Trim(); + // dr.pdate = dtPdate.Value.ToShortDateString(); + dr.project = tbProject.Text.Trim(); + dr.AcceptChanges(); + dr.SetAdded(); + itemAmt += dr.pumamt; + } } + } - - - - - - - - //part 목록을 조회해서 NR에 등록해줘야 함 - var dlg2 = FCOMMON.Util.MsgQ("해당 파트리스트를 NR구매 목록에 등록 하시겠습니까?\n" + + var dlg2 = FCOMMON.Util.MsgQ($"해당 파트리스트를 ({(crmode ? "CR":"NR")})구매 목록에 등록 하시겠습니까?\n" + itemCount.ToString() + "건 " + itemAmt.ToString("N0") + "원"); if (dlg2 != System.Windows.Forms.DialogResult.Yes) return; + if (crmode) + taCR.Update(this.dsPRJ.EETGW_PurchaseCR); + else + taNR.Update(this.dsPRJ.Purchase); - ta.Update(this.dsPRJ.Purchase); - dsPRJ.Purchase.AcceptChanges(); + dsPRJ.AcceptChanges(); FCOMMON.Util.MsgI("Save OK"); } bool checkCombo() { - if (cbProcess.Text.isEmpty() == true) + if (crmode == false && cbProcess.Text.isEmpty() == true) { FCOMMON.Util.MsgE("프로세스를 선택하세요."); cbProcess.Focus(); @@ -278,7 +293,7 @@ namespace FEQ0000 return false; } } - if (this.cbProcess.Text.isEmpty() == true) + if (crmode == false && this.cbProcess.Text.isEmpty() == true) { { @@ -291,7 +306,7 @@ namespace FEQ0000 return false; } } - if (cbManuProc.Text.isEmpty() == true) + if (crmode == false && cbManuProc.Text.isEmpty() == true) { { @@ -304,7 +319,7 @@ namespace FEQ0000 return false; } } - if (this.cbEQManu.Text.isEmpty() == true) + if (crmode == false && this.cbEQManu.Text.isEmpty() == true) { { @@ -337,6 +352,12 @@ namespace FEQ0000 return; } + if(nudPdate.Value <1 || nudSid.Value < 1 || nudPumName.Value < 1) + { + Util.MsgE($"요청일/SID/품명은 반드시 설정되어야 합니다"); + return; + } + libxl.Book book;// = new libxl.BinBook(); @@ -370,14 +391,15 @@ namespace FEQ0000 MinRow = (int)Math.Max(MinRow, nudS.Value - 1); - + this.progressBar1.Value = 0; this.progressBar1.Maximum = MaxRow - MinRow + 1; this.listView1.Items.Clear(); this.listView1.Visible = false; - this.dsPRJ.Purchase.Clear(); - this.dsPRJ.Purchase.AcceptChanges(); + + this.dsPRJ.Clear(); + this.dsPRJ.AcceptChanges(); var db = new DataClasses1DataContext(); decimal sumamt = 0; @@ -407,6 +429,8 @@ namespace FEQ0000 string 요청인 = string.Empty; string 수령인 = string.Empty; + string CostCode = string.Empty; + string LIneCode = string.Empty; var cf_qty = sheet.cellType(r, (int)nudQty.Value - 1); var cf_price = sheet.cellType(r, (int)nudPrice.Value - 1); @@ -456,7 +480,7 @@ namespace FEQ0000 else { if (int.TryParse(daybuf[0], out mm) == false) mm = 0; - if (int.TryParse(daybuf[1].Replace("일",""), out dd) == false) dd = 0; + if (int.TryParse(daybuf[1].Replace("일", ""), out dd) == false) dd = 0; } if (mm == 0 || dd == 0 || yy == 0) 요청일 = orgstr; @@ -490,9 +514,9 @@ namespace FEQ0000 요청인 = sheet.readStr(r, (int)nudReq.Value - 1).Trim(); 수령인 = sheet.readStr(r, (int)nudRecv.Value - 1).Trim(); - if(요청인.isEmpty()==false) + if (요청인.isEmpty() == false) { - var requser=db.vGroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.name == 요청인).FirstOrDefault(); + var requser = db.vGroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.name == 요청인).FirstOrDefault(); if (requser != null) 요청인 = requser.id; } if (수령인.isEmpty() == false) @@ -520,6 +544,11 @@ namespace FEQ0000 if (nudPo.Value > 0) PO = sheet.readStr(r, (int)nudPo.Value - 1).Trim(); if (nudMemo.Value > 0) 비고 = sheet.readStr(r, (int)nudMemo.Value - 1).Trim(); + + if (nudCost.Value > 0) CostCode = sheet.readStr(r, (int)nudCost.Value - 1).Trim(); + if (nudLine.Value > 0) LIneCode = sheet.readStr(r, (int)nudLine.Value - 1).Trim(); + + //sid 공백과 - _ 제거 200506 SID = SID.Replace(" ", "").Replace("-", "").Replace("_", "").Trim(); @@ -555,10 +584,6 @@ namespace FEQ0000 newitem.Checked = false; newitem.SubItems.Add(요청인); - - - newitem.SubItems.Add(SC); - newitem.SubItems.Add(CRCF); newitem.SubItems.Add(SID); newitem.SubItems.Add(품명); newitem.SubItems.Add(규격); @@ -567,35 +592,78 @@ namespace FEQ0000 newitem.SubItems.Add(d_price.ToString()); newitem.SubItems.Add(d_amt.ToString()); newitem.SubItems.Add(v_공급처); - newitem.SubItems.Add(PO); newitem.SubItems.Add(비고); + newitem.SubItems.Add(PO); + newitem.SubItems.Add(SC); + newitem.SubItems.Add(CRCF); + + + + newitem.SubItems.Add(입고일); newitem.SubItems.Add(수령인); + newitem.SubItems.Add(CostCode); + newitem.SubItems.Add(LIneCode); + //데이터도 추가를 해준다 - var newdr = this.dsPRJ.Purchase.NewPurchaseRow(); - newdr.wuid = FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.sc = SC; - newdr.orderno = CRCF; - newdr.sid = SID; - newdr.pumname = 품명; - newdr.pumscale = 규격; - newdr.pumqty = d_qty; - newdr.pumprice = d_price; - newdr.pumamt = d_amt; - newdr.supply = v_공급처; - newdr.supplyidx = v_공급처코드; - newdr.po = PO; - newdr.bigo = 비고; - newdr.indate = 입고일; - newdr.pdate = 요청일; - newdr.request = 요청인; - newdr.receive = 수령인; - newdr.import = true; - newitem.Tag = newdr; - this.dsPRJ.Purchase.AddPurchaseRow(newdr); + if (crmode) + { + var newdr = this.dsPRJ.EETGW_PurchaseCR.NewEETGW_PurchaseCRRow(); + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.sc = SC; + newdr.orderno = CRCF; + newdr.sid = SID; + newdr.pumname = 품명; + newdr.pumscale = 규격; + newdr.pumqty = d_qty; + newdr.pumprice = d_price; + newdr.pumamt = d_amt; + newdr.supply = v_공급처; + newdr.supplyidx = v_공급처코드; + newdr.po = PO; + newdr.bigo = 비고; + newdr.indate = 입고일; + newdr.pdate = 요청일; + newdr.request = 요청인; + newdr.receive = 수령인; + newdr.import = true; + newdr.costcenter = CostCode; + newdr.linecode = LIneCode; + newitem.Tag = newdr; + this.dsPRJ.EETGW_PurchaseCR.AddEETGW_PurchaseCRRow(newdr); + } + else + { + var newdr = this.dsPRJ.Purchase.NewPurchaseRow(); + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.sc = SC; + newdr.orderno = CRCF; + newdr.sid = SID; + newdr.pumname = 품명; + newdr.pumscale = 규격; + newdr.pumqty = d_qty; + newdr.pumprice = d_price; + newdr.pumamt = d_amt; + newdr.supply = v_공급처; + newdr.supplyidx = v_공급처코드; + newdr.po = PO; + newdr.bigo = 비고; + newdr.indate = 입고일; + newdr.pdate = 요청일; + newdr.request = 요청인; + newdr.receive = 수령인; + newdr.import = true; + newdr.costcenter = CostCode; + newdr.linecode = LIneCode; + newitem.Tag = newdr; + this.dsPRJ.Purchase.AddPurchaseRow(newdr); + } + @@ -677,5 +745,38 @@ namespace FEQ0000 { } + + private void nudSc_TabIndexChanged(object sender, EventArgs e) + { + + } + + private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var idx = 1; + nudPdate.Value = idx++; + nudReq.Value = idx++; + nudSid.Value = idx++; + nudPumName.Value = idx++; + nudScale.Value = idx++; + nudQty.Value = idx++; + nudUnit.Value = idx++; + nudPrice.Value = idx++; + idx++;//nudAmkt.Value = 6; + nudSupplty.Value = idx++; + nudMemo.Value = idx++; + nudPo.Value = idx++; + nudSc.Value = idx++; + nudCr.Value = idx++; + nudInDate.Value = idx++; + nudRecv.Value = idx++; + nudCost.Value = idx++; + nudLine.Value = idx++; + } + + private void label25_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx index d6055a8..4ae5bf8 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx @@ -120,22 +120,10 @@ False - - False - - - False - - - False - - - False - False - + 83, 17 @@ -151,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/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 @@ -162,7 +150,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -171,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -180,7 +168,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/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 @@ -191,41 +179,47 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKPSURBVDhPzZFfT1JxGMdPW1t32fpz0VwvoPfg1k03XbYu - WlubXTRnm26pF26poZVuXaSx1AwkPSpknmyCiAgiVAgiLgVEFIk/53DO4QCeg400RuMbnGitd+B3e/Zc - PJ/P8/ttD3Gykkgk6pLR0AK77Thit5bBfTWD8xrBefTg1z7+5INuJ8uydVX8/9A0TXJhdyEVsEAMrkDY - NGFvRYugeQwR6xgO12YgfplE0jpaEiJ+Q1X7E4ZhlriAA9mAFVtLJObHB0CRauim50FqjVCTBug0ajg0 - PchaBiGalcj4bX5Zjsfj/dzOKrK+Rdip11hd38F7p4QphwSNVcSQ6QD9+gx6KQF6t4Q9yxSSH54ip+8D - 7XePE8xuIMV6Z7GzbkOxWITBc4gJuwS1RcS5S1dQc7EWz2bS6NSmyl2QGd7vBKvrgE/VUiT2nFQpRUdw - fHwsDylnDiPmLJTGLGou1OLs+ct4NMWjTcOiq9wrTIXNRvzYGGgEEQ2HfomiiHw+j0KhgBVfrvxlAX0U - j8c6Fu3jSTxUM2gcTuCtNSMzFbbihKj+EsFsLItCPIRcLicPIsnvUC3y6CDp8qsJNI3EcP9VFJ0TNDb3 - JZmpsHzQi5i6rUDEwsE3qbVZpMtXOODikCQJvrAAcimB9tEwWkb2MDQXg2c7JYuiwEHwLIAeboBLpXDJ - l9jddLuY5VFkHRqkvFYxs+/j0jwdz2Qy0b+VTqejrM/F8fNKJMqy5XkrB4I4JS+oxPvJrF+dHCx+m+mF - YHwBwaoG79CCs2vB20gw+pdgVE2wdd8rGYefrNsV105X1X8xKZvPGPoablOK+um57nrB1HPnh1lx90jf - dSs/23rzs7b5Ruu7B9evVvETEYL4DcxgGApeCNxgAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKOSURBVDhPzZHdT1JxGMdPW1t32Xq5aK4/oP/BrZtuuvSq + tbXZRXO2aTO7cEuNrHRrLY2lhiDJMSGSbIKICCJYCCIt5VVF4uUczjkcwAM20hiNb3Citf4Dv9tvz8Xz + +fyeZ3uI45VkMtmUim0vMEHbIbO1DParGazXCNajB7eu+8mF3E6GYZrq+P+hKIpkI85SOmCBEFoBv2nC + 7ooaIfMkotZJHKzPQPj8FknzeIWP+g117U9oml5iAw7kAlZsLZGYVw1DRyqg0c6DVBuhIA3QKBVwKPuR + s4xAMEuR9dv8opxIJIbY8BpyvkXYda+xthHGe2ce0448lFYBo6Z9DOmzGNDx0Lvz2LVMI/XhCQr6QVB+ + t4qgdwJpxjuL8IYN5XIZBs8Bpux5KCwCzly4hIbzjXg6k0GvOl2tvMhwficYTQ988rtlIryqraSpKI6O + jsSmzlmAzJyD1JhDw7lGnD57EQ+mOdxXMuir1hpTY3NRP74Mt4HY2w7+EgQBxWIRpVIJK75CdWUegzoO + DzUMulUpdCpotI0l8caaFZkaW3OC2ucVgt6wCnxiG4VCQWxEU98hX+TQQ1LVqUm0y+K4/SqG3ikKm3t5 + kamxXMiLuKyzRMQjofH0+iwy1Svsswnk83n4IjzIpSS6JyK4J9vF6FwcnmBaFAWeBe9ZADXWCpdc4hIv + sbPpdtHLE8g5lEhXN8ru+dgMRyWy2Wzs78tkMjHG52K5eSmSVdnyrIsFQZwQP6jFu2rWr6lGyt9mBsAb + X4C3KsA51GDtanA2ErT+JWh5OyySWxXj2OMNu+TKybr6LyZpxynDYOt1naRFO/eohTf13/hhltw8/NjX + XJztav6k7rjW9e7O1ct1/FiEIH4DO4IXxHMqXrIAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKRSURBVDhPvZJfSFNhGMa/6I8EXXgR0YUUhaBFUEGsqIRg - MOoquoigpMjIRCuVJIymc8Zscy43mW45Nzsej9ZmbjjLOSe46bacFDIHGwou0a66EnczJj2d7+tgBRFd - 9cDHgYfv977v836H/HfxPA+Hw4Hu7m50dnaWknA4DHqmp6cxNTWFyclJ+P1+jI2Nwev1wu12w+VyYXBw - EH19fexuLpfD2toajEZjgszMzGBzcxPZbPavZ2NjA3a7/cv6+jpSqRT0en1ap9NVklAoxIzV1VVEo1Gs - rKyAeul0GhMTE1haWsLo6Ci7MzQ0hEQiwSYSYbmUipBAIIBIJEJHlgWDQQwPD8soLAiCjMaw2WwyCnd0 - dMhEj+XXaDTFEk6Iz+dDPB5nO1heXmY7oJ0pnEwmtzr39/djfn6edodKpdoj4T/k8XiQyWQwPj7OOo+M - jLDOdFyDwSCr5i/gbu9J9PT0oLGxERL2U06nUxmLxbC4uAgK086ih4WFBdCnu8+XQO29jmvWYtTX13+T - sN/FcRzdNKxWK6qFEjzkz6CCO4Uy+wko3VfhnDOhznUZivb9ICDbJOzPquJPw/OpC28/mhn4es4IY6AO - XLQVFYICx5/n5baKiLmKXoqyWCx00zQz7oh5KfzCXw2drwqa9+Vo8t5G87t7sIaeofTVeRx8QrKsgPgs - Svo1mUw1bW1tn7Vabc0N2xG8iRkhfDCAi7TCEdaKRSphCTWjXLiIQ0qSLKglu1kBs9msFH9L9lyzs7MY - GBjAFcthXDIVQN6+D+f0+bjZexZdwSaU8QoUPsrPFj4geQz+VS0tLVCr1WhoaKiRrC0VqXZmbnFyHHu8 - F0dVZJdk/7vEvF8PPN0OoiI7JEsUId8BIOfnsen318AAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKRSURBVDhPvZJfSFNhGMa/6I8EXXgR0YUUhpCFFwWxIhMC + QeoquoigpMjIRCsXiBhN54zZ5lxuMt1ybnY8Hq3N3HCWc5vgpttyUogOJhu4RLvqStzNmPR0vq+DFUR0 + 1QMfBx6+3/u87/sd8t/F8zzsdjv6+vrQ09NTScLhMOiZnZ3FzMwMpqen4fP5MDk5CY/HA5fLBafTiZGR + EQwODrK7uVwOGxsbMBgMcTI3N4ft7W1ks9m/nq2tLdhsti+bm5tYWVmBTqdLa7XaWhIKhZixvr6OaDSK + tbU1UC+dTsPv9yOVSmFiYoLdGR0dRTweZx2JcLk0FSGBQACRSIS2LAsGgxgbG5NRWBAEGR3DarXKKNzd + 3S0TPTa/Wq0ulnBCvF4vlpaW2A5WV1fZDmgyhROJxE7y0NAQFhcXaTqUSuUBCf8ht9uNTCaDqakpljw+ + Ps6Sabt6vV5Wz1/EvYHT6O/vR0tLCyTspxwOhyIWiyGZTILCNFn0sLy8DPp0D/gyqDw3cN1SjKampm8S + 9rs4jqObhsViQb1Qhkf8OdRwZ1BlOwWF6xocC0Y0OK+gouswCMguCfuz6vizcH/qxduPJga+XjDAEGgA + F+1AjVCBkud5uZ0i4lzHX4oym81003Rm3BXnpfALXz203jqo31ej1XMHbe/uwxJ6hspXF1DQSLKsgPgs + Cvo1Go3yzs7OzxqNRn7TegJvYgYIH/TgIh2whzVikVqYQ22oFi6hUEESBY/JflbAZDIpxN+SPdf8/DyG + h4dx1XwMl40FKO86hFJdPm4NnEdvsBVVfAUK5fnZoockj8G/qr29HSqVCs3NzXLJ2lGRcm/mNleOksaD + OKkk+yT733X0Cfl65OluECXZI1miCPkOEnfnn54KSIAAAAAASUVORK5CYII= - + 147, 17 292, 17 + + 450, 17 + + + 530, 17 + \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index 8498235..800955d 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -30,36 +30,38 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseCR)); - 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType6 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); @@ -419,6 +421,7 @@ this.toolStripButton7.Name = "toolStripButton7"; this.toolStripButton7.Size = new System.Drawing.Size(60, 23); this.toolStripButton7.Text = "기능"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); // // 입고품목메일전송ToolStripMenuItem // @@ -430,12 +433,10 @@ // // 엑셀에서가져오기ToolStripMenuItem // - this.엑셀에서가져오기ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image"))); this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem"; this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(208, 22); this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기"; - this.엑셀에서가져오기ToolStripMenuItem.Visible = false; this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click); // // sAP구매신청엑셀작성ToolStripMenuItem @@ -861,284 +862,294 @@ 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 = 30; + this.fpSpread1_Sheet1.ColumnCount = 32; 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 = "등록일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "요청검사"; 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, 1).Value = "구매검사"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Storage"; + 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, 3).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Cost Center"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Storage"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "LineCode"; + 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 = "SC#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Cost Center"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 10; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "품목정보"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단가($)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "합계금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "공급업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "LineCode"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "SC#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).ColumnSpan = 10; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "품목정보"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "단가($)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "공급업체"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).ColumnSpan = 5; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "입고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).ColumnSpan = 5; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "모델"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "단가($)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "공급"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "예정일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "수령인"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "모델"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "단가($)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "공급"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "예정일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "수령인"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 29F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 35F; - this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Tag = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; - 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 = 51F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType4; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1"; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 33F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2"; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 37F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestName"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(3).Tag = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "state"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "costcenter"; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "linecode"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sc"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costcenter"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "linecode"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumname"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sc"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sc"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).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(9).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "crcf"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "sid"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "모델"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType10.DecimalPlaces = 0; + numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType10.MaximumValue = 2147483647D; + numberCellType10.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumunit"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "sid"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "모델"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - numberCellType3.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumpriceD"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "단가($)"; - this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumpriceD"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.MaximumValue = 9999999999999.99D; - numberCellType4.MinimumValue = -9999999999999.99D; - numberCellType4.NegativeRed = true; - numberCellType4.NullDisplay = "--"; - numberCellType4.Separator = ","; - numberCellType4.ShowSeparator = true; - numberCellType4.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumprice"; + numberCellType11.DecimalPlaces = 0; + numberCellType11.NegativeRed = true; + numberCellType11.NullDisplay = "--"; + numberCellType11.Separator = ","; + numberCellType11.ShowSeparator = true; + numberCellType11.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumamt"; + numberCellType12.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "금액"; - this.fpSpread1_Sheet1.Columns.Get(16).Tag = "pumamt"; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "단가($)"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "pumpriceD"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType13.DecimalPlaces = 0; + numberCellType13.MaximumValue = 9999999999999.99D; + numberCellType13.MinimumValue = -9999999999999.99D; + numberCellType13.NegativeRed = true; + numberCellType13.NullDisplay = "--"; + numberCellType13.Separator = ","; + numberCellType13.ShowSeparator = true; + numberCellType13.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Visible = false; + numberCellType14.DecimalPlaces = 0; + numberCellType14.MaximumValue = 9999999999999.99D; + numberCellType14.MinimumValue = -9999999999999.99D; + numberCellType14.NegativeRed = true; + numberCellType14.NullDisplay = "--"; + numberCellType14.Separator = ","; + numberCellType14.ShowSeparator = true; + numberCellType14.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType14; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "금액"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "project"; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(19).Tag = "project"; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "projectidx"; + numberCellType15.DecimalPlaces = 0; + numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType15.MaximumValue = 2147483647D; + numberCellType15.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType15; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(21).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Tag = "project"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType16.DecimalPlaces = 0; + numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType16.MaximumValue = 2147483647D; + numberCellType16.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType16; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "예정일"; - this.fpSpread1_Sheet1.Columns.Get(22).Tag = "edate"; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "수령인"; - this.fpSpread1_Sheet1.Columns.Get(23).Tag = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(24).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "예정일"; + this.fpSpread1_Sheet1.Columns.Get(24).Tag = "edate"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.NegativeRed = true; - numberCellType8.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inremark"; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inremark"; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType37; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "수령인"; + this.fpSpread1_Sheet1.Columns.Get(25).Tag = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType38; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(26).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; + numberCellType17.DecimalPlaces = 0; + numberCellType17.NegativeRed = true; + numberCellType17.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType17; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po"; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(27).Tag = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(29).Tag = "idx"; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType39; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "inremark"; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(28).Tag = "inremark"; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType40; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).Tag = "po"; + this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = checkBoxCellType6; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(30).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = numberCellType18; + this.fpSpread1_Sheet1.Columns.Get(31).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(31).Tag = "idx"; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index e6687de..0449fb6 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -138,12 +138,14 @@ namespace FEQ0000 if (curLevel >= 5) { btSave.Visible = true; + 엑셀에서가져오기ToolStripMenuItem.Visible = true; //fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.Normal; //fpSpread1.ActiveSheet.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Cell; //fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.MultiSelect; } else { + 엑셀에서가져오기ToolStripMenuItem.Visible = false; btSave.Visible = false; btViewDel.Visible = false; fpSpread1.EditMode = false; @@ -964,7 +966,7 @@ namespace FEQ0000 private void 엑셀에서가져오기ToolStripMenuItem_Click(object sender, EventArgs e) { - var f = new fPurchase_excelimport(); + var f = new fPurchase_excelimport(true); f.Show(); } @@ -1323,5 +1325,10 @@ namespace FEQ0000 FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); } } + + private void toolStripButton7_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx index 6e42e20..bc1b751 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/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 @@ -147,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/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 @@ -176,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/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 @@ -211,7 +211,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs index 07af632..0933efe 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs @@ -84,6 +84,7 @@ this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.button7 = new System.Windows.Forms.Button(); this.tbLineCode = new System.Windows.Forms.TextBox(); this.tbCostCenter = new System.Windows.Forms.TextBox(); this.tbInRemar = new System.Windows.Forms.TextBox(); @@ -96,7 +97,6 @@ this.timer1 = new System.Windows.Forms.Timer(this.components); this.chk2 = new System.Windows.Forms.CheckBox(); this.chk1 = new System.Windows.Forms.CheckBox(); - this.button7 = new System.Windows.Forms.Button(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -206,7 +206,7 @@ // deptLabel // deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(14, 426); + deptLabel.Location = new System.Drawing.Point(14, 438); deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); deptLabel.Name = "deptLabel"; deptLabel.Size = new System.Drawing.Size(39, 20); @@ -310,7 +310,7 @@ // label7 // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(20, 373); + label7.Location = new System.Drawing.Point(9, 388); label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; label7.Size = new System.Drawing.Size(78, 20); @@ -320,7 +320,7 @@ // label11 // label11.AutoSize = true; - label11.Location = new System.Drawing.Point(9, 343); + label11.Location = new System.Drawing.Point(-2, 357); label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label11.Name = "label11"; label11.Size = new System.Drawing.Size(89, 20); @@ -466,12 +466,12 @@ // tbBigo // this.tbBigo.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbBigo.Location = new System.Drawing.Point(12, 450); + this.tbBigo.Location = new System.Drawing.Point(12, 465); this.tbBigo.Margin = new System.Windows.Forms.Padding(4); this.tbBigo.MaxLength = 500; this.tbBigo.Multiline = true; this.tbBigo.Name = "tbBigo"; - this.tbBigo.Size = new System.Drawing.Size(490, 130); + this.tbBigo.Size = new System.Drawing.Size(490, 115); this.tbBigo.TabIndex = 28; this.tbBigo.TabStop = false; this.toolTip1.SetToolTip(this.tbBigo, resources.GetString("tbBigo.ToolTip")); @@ -616,8 +616,12 @@ // groupBox1 // this.groupBox1.Controls.Add(this.btSIDChk); + this.groupBox1.Controls.Add(this.tbLineCode); this.groupBox1.Controls.Add(this.tbStorage); + this.groupBox1.Controls.Add(label7); this.groupBox1.Controls.Add(label10); + this.groupBox1.Controls.Add(this.tbCostCenter); + this.groupBox1.Controls.Add(label11); this.groupBox1.Controls.Add(label9); this.groupBox1.Controls.Add(this.tbPumPriceD); this.groupBox1.Controls.Add(label8); @@ -652,7 +656,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(490, 410); + this.groupBox1.Size = new System.Drawing.Size(490, 421); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; @@ -723,10 +727,6 @@ // this.groupBox2.BackColor = System.Drawing.Color.Gainsboro; this.groupBox2.Controls.Add(this.button7); - this.groupBox2.Controls.Add(this.tbLineCode); - this.groupBox2.Controls.Add(label7); - this.groupBox2.Controls.Add(this.tbCostCenter); - this.groupBox2.Controls.Add(label11); this.groupBox2.Controls.Add(this.tbInRemar); this.groupBox2.Controls.Add(label4); this.groupBox2.Controls.Add(this.tbInQty); @@ -752,20 +752,31 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; // + // button7 + // + this.button7.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button7.Location = new System.Drawing.Point(4, 534); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(401, 35); + this.button7.TabIndex = 37; + this.button7.Text = "견적서폴더"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.button7_Click_1); + // // tbLineCode // - this.tbLineCode.Location = new System.Drawing.Point(104, 370); + this.tbLineCode.Location = new System.Drawing.Point(93, 385); this.tbLineCode.Margin = new System.Windows.Forms.Padding(4); this.tbLineCode.Name = "tbLineCode"; - this.tbLineCode.Size = new System.Drawing.Size(286, 27); + this.tbLineCode.Size = new System.Drawing.Size(381, 27); this.tbLineCode.TabIndex = 21; // // tbCostCenter // - this.tbCostCenter.Location = new System.Drawing.Point(104, 339); + this.tbCostCenter.Location = new System.Drawing.Point(93, 353); this.tbCostCenter.Margin = new System.Windows.Forms.Padding(4); this.tbCostCenter.Name = "tbCostCenter"; - this.tbCostCenter.Size = new System.Drawing.Size(286, 27); + this.tbCostCenter.Size = new System.Drawing.Size(381, 27); this.tbCostCenter.TabIndex = 19; // // tbInRemar @@ -818,7 +829,7 @@ // this.chk2.AutoSize = true; this.chk2.Enabled = false; - this.chk2.Location = new System.Drawing.Point(369, 422); + this.chk2.Location = new System.Drawing.Point(369, 434); this.chk2.Name = "chk2"; this.chk2.Size = new System.Drawing.Size(133, 24); this.chk2.TabIndex = 44; @@ -829,24 +840,13 @@ // this.chk1.AutoSize = true; this.chk1.Enabled = false; - this.chk1.Location = new System.Drawing.Point(262, 422); + this.chk1.Location = new System.Drawing.Point(262, 434); this.chk1.Name = "chk1"; this.chk1.Size = new System.Drawing.Size(103, 24); this.chk1.TabIndex = 43; this.chk1.Text = "요청자확인"; this.chk1.UseVisualStyleBackColor = true; // - // button7 - // - this.button7.Dock = System.Windows.Forms.DockStyle.Bottom; - this.button7.Location = new System.Drawing.Point(4, 534); - this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(401, 35); - this.button7.TabIndex = 37; - this.button7.Text = "견적서폴더"; - this.button7.UseVisualStyleBackColor = true; - this.button7.Click += new System.EventHandler(this.button7_Click_1); - // // fPurchaseCR_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index e7ec871..bceb15a 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -60,6 +60,7 @@ namespace FEQ0000 // this.Show(); // Application.DoEvents(); advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); + tbPumName.ImeMode = ImeMode.Alpha; //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); @@ -297,9 +298,16 @@ namespace FEQ0000 binit = true; if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + { sidchk1 = string.Empty; + dbchk1 = string.Empty; + } else + { sidchk1 = tbSID.Text; + dbchk1 = tbPumName.Text; + } + timer1.Start(); @@ -365,6 +373,7 @@ namespace FEQ0000 if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { dbchk1 = f.itemName; + sidchk1 = string.Empty; //인덱스값이 다르면 모델 및 가격을 업데이트 한다. tbPumName.Text = f.itemName; @@ -542,12 +551,16 @@ namespace FEQ0000 if (int.TryParse(tbProjectIndex.Text, out int pidx) == false || pidx < 1) { - FCOMMON.Util.MsgE("프로젝트가 선택되지 않았습니다. 직접입력은 허용되지 않습니다.\n" + - "프로젝트 명을 입력하고 Enter 키를 눌러서 관련 프로젝트를 선택하세요\n" + - "프로젝트가 없는 경우에는 비고란에 해당 내용을 기입하세요"); - tbProject.Focus(); - tbProject.SelectAll(); - return false; + if(tbBigo.Text.isEmpty() == true) + { + FCOMMON.Util.MsgE("프로젝트가 선택되지 않았습니다. 직접입력은 허용되지 않습니다.\n" + + "프로젝트 명을 입력하고 Enter 키를 눌러서 관련 프로젝트를 선택하세요\n" + + "프로젝트가 없는 경우에는 비고란에 해당 내용을 기입하세요"); + tbProject.Focus(); + tbProject.SelectAll(); + return false; + } + } if (tbOrderNo.Text.isEmpty()) @@ -555,6 +568,8 @@ namespace FEQ0000 FCOMMON.Util.MsgI( "CR/CF 구매의 경우 CR/CF 값이 반드시 입력되어야 합니다\n" + "프로젝트를 선택한 경우에 해당 값이 없다면 프로젝트 편집화면에서 해당 값을 입력한 후 다시 시도하세요"); + tbOrderNo.Focus(); + tbOrderNo.SelectAll(); return false; } @@ -915,7 +930,7 @@ namespace FEQ0000 private void tbPumName_Click(object sender, EventArgs e) { - Lov_Item("", true); + //Lov_Item("", true); } private void tbPumName_TextChanged(object sender, EventArgs e) @@ -925,7 +940,7 @@ namespace FEQ0000 private void button1_Click_1(object sender, EventArgs e) { - Lov_Item("", true); + Lov_Item(tbPumName.Text, true); } private void button2_Click_1(object sender, EventArgs e)