diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index dc8e343..bc8c373 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("21.03.11.0900")]
-[assembly: AssemblyFileVersion("21.03.11.0900")]
+[assembly: AssemblyVersion("21.03.22.0830")]
+[assembly: AssemblyFileVersion("21.03.22.0830")]
diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs
index 98762fc..2aa717c 100644
--- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs
+++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs
@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bsB = new System.Windows.Forms.BindingSource(this.components);
@@ -105,6 +105,8 @@
this.bsME = new System.Windows.Forms.BindingSource(this.components);
this.bsIng = new System.Windows.Forms.BindingSource(this.components);
this.taIng = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
@@ -142,15 +144,17 @@
this.toolStripSeparator1,
this.toolStripLabel1,
this.tbFilter,
- this.btFind});
- this.bn.Location = new System.Drawing.Point(0, 558);
+ this.btFind,
+ this.toolStripButton1,
+ this.prb1});
+ this.bn.Location = new System.Drawing.Point(0, 596);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(1004, 25);
+ this.bn.Size = new System.Drawing.Size(1105, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -312,15 +316,15 @@
this.dv.Location = new System.Drawing.Point(0, 165);
this.dv.Name = "dv";
this.dv.RowTemplate.Height = 23;
- this.dv.Size = new System.Drawing.Size(1004, 393);
+ this.dv.Size = new System.Drawing.Size(1105, 431);
this.dv.TabIndex = 1;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn1.HeaderText = "idx";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
@@ -590,7 +594,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 30);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1004, 135);
+ this.panel1.Size = new System.Drawing.Size(1105, 135);
this.panel1.TabIndex = 2;
this.panel1.Visible = false;
//
@@ -610,7 +614,7 @@
this.toolStripDropDownButton2});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1004, 30);
+ this.toolStrip1.Size = new System.Drawing.Size(1105, 30);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
@@ -764,11 +768,27 @@
//
this.taIng.ClearBeforeFill = true;
//
+ // toolStripButton1
+ //
+ this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(118, 22);
+ this.toolStripButton1.Text = "Tem/Part Update";
+ this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다.";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
+ //
+ // prb1
+ //
+ this.prb1.Name = "prb1";
+ this.prb1.Size = new System.Drawing.Size(100, 22);
+ //
// fEquipment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1004, 583);
+ this.ClientSize = new System.Drawing.Size(1105, 621);
this.Controls.Add(this.dv);
this.Controls.Add(this.panel1);
this.Controls.Add(this.bn);
@@ -873,5 +893,7 @@
private System.Windows.Forms.ToolStripMenuItem 장비모델생성공통07ToolStripMenuItem;
private System.Windows.Forms.BindingSource bsIng;
private dsEQTableAdapters.EETGW_EquipmentIngTableAdapter taIng;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ToolStripProgressBar prb1;
}
}
\ No newline at end of file
diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs
index 1d5f11c..2f7c3c5 100644
--- a/SubProject/FEQ0000/Equipment/fEquipment.cs
+++ b/SubProject/FEQ0000/Equipment/fEquipment.cs
@@ -42,6 +42,13 @@ namespace FEQ0000
this.dsEQ.EquipmentF.TableNewRow += Equipment_TableNewRow;
dvc_param.Visible = false;
}
+ else if (dataType == eTabletype.ING)
+ {
+
+ tableName = "EETGW_EquipmentIng";
+ this.dsEQ.EETGW_EquipmentIng.TableNewRow += Equipment_TableNewRow;
+ dvc_param.Visible = false;
+ }
else
{
@@ -136,7 +143,7 @@ namespace FEQ0000
{
this.taME.Update(this.dsEQ.EquipmentME);
}
- else if(dataType == eTabletype.ING)
+ else if (dataType == eTabletype.ING)
{
this.taIng.Update(this.dsEQ.EETGW_EquipmentIng);
}
@@ -238,7 +245,7 @@ namespace FEQ0000
var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
f.Show();
}
-
+
private void toolStripButton2_Click(object sender, EventArgs e)
{
@@ -366,7 +373,7 @@ namespace FEQ0000
private void applyToolStripMenuItem_Click(object sender, EventArgs e)
{
- var f = new EQFilterApply( this.dataType == eTabletype.ING ? "I" : "E");
+ var f = new EQFilterApply(this.dataType == eTabletype.ING ? "I" : "E");
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var dlg = FCOMMON.Util.MsgQ("매크로를 적용 하시겠습니까?");
@@ -428,20 +435,20 @@ namespace FEQ0000
cmd.CommandText = "select * from common where grp ='07' and svalue <> '' and isnull(code,'') = ''";
var rdr = cmd.ExecuteReader();
- while(rdr.Read())
+ while (rdr.Read())
{
string manu = rdr["svalue"].ToString();
- cmd2.CommandText = "select code from common where grp ='06' and memo='"+manu+"'";
+ cmd2.CommandText = "select code from common where grp ='06' and memo='" + manu + "'";
var manu_data = cmd2.ExecuteScalar();
if (manu_data == null) continue;
var manu_code = manu_data.ToString();
- cmd2.CommandText = "update common set code = '"+manu_code+"' where grp = '07' and isnull(code,'') = '' and svalue = '"+manu+"'";
+ cmd2.CommandText = "update common set code = '" + manu_code + "' where grp = '07' and isnull(code,'') = '' and svalue = '" + manu + "'";
cmd2.ExecuteNonQuery();
}
-
+
cmd.Dispose();
cn1.Close();
cn2.Close();
@@ -450,6 +457,103 @@ namespace FEQ0000
FCOMMON.Util.MsgI("ok");
}
+
+ private void toolStripButton1_Click_1(object sender, EventArgs e)
+ {
+ var dlg = FCOMMON.Util.MsgQ("Team/Part 정보를 서버의 정보로 변경 할까요?");
+ if (dlg != DialogResult.Yes) return;
+
+ this.prb1.Minimum = 0;
+ this.prb1.Value = 0;
+
+
+ var ucnt = 0;
+ var taLIne = new dsEQTableAdapters.LineCodeTableAdapter();
+ var dtLineCode = taLIne.GetData();
+ if (dataType == eTabletype.MOLD)
+ {
+ this.prb1.Maximum = this.dsEQ.EquipmentME.Count;
+ foreach (dsEQ.EquipmentMERow dr in this.dsEQ.EquipmentME)
+ {
+ if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
+ if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+ var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
+ if (linedata != null)
+ {
+ if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+ {
+ dr.lineP = linedata.part;
+ dr.lineT = linedata.team;
+ dr.EndEdit();
+ ucnt += 1;
+ }
+ }
+ }
+ }
+ else if (dataType == eTabletype.FOL)
+ {
+ this.prb1.Maximum = this.dsEQ.EquipmentF.Count;
+ foreach (dsEQ.EquipmentFRow dr in this.dsEQ.EquipmentF)
+ {
+ if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
+ if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+ var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
+ if (linedata != null)
+ {
+ if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+ {
+ dr.lineP = linedata.part;
+ dr.lineT = linedata.team;
+ dr.EndEdit();
+ ucnt += 1;
+ }
+ }
+ }
+ }
+ else if (dataType == eTabletype.ING)
+ {
+ this.prb1.Maximum = this.dsEQ.EETGW_EquipmentIng.Count;
+ foreach (dsEQ.EETGW_EquipmentIngRow dr in this.dsEQ.EETGW_EquipmentIng)
+ {
+ if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
+ if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+ var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
+ if (linedata != null)
+ {
+ if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+ {
+ dr.lineP = linedata.part;
+ dr.lineT = linedata.team;
+ dr.EndEdit();
+ ucnt += 1;
+ }
+ }
+ }
+ }
+ else
+ {
+ this.prb1.Maximum = this.dsEQ.EquipmentB.Count;
+ foreach (dsEQ.EquipmentBRow dr in this.dsEQ.EquipmentB)
+ {
+ if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
+ if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+ var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
+ if (linedata != null)
+ {
+ if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+ {
+ dr.lineP = linedata.part;
+ dr.lineT = linedata.team;
+ dr.EndEdit();
+ ucnt += 1;
+ }
+ }
+ }
+ }
+
+ FCOMMON.Util.MsgI($"{ucnt} 건의 자료가 변경 되었습니다. 적용하려면 '저장' 버튼을 누르세요");
+
+ }
}
}
diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx
index 24bbce8..09158f4 100644
--- a/SubProject/FEQ0000/Equipment/fEquipment.resx
+++ b/SubProject/FEQ0000/Equipment/fEquipment.resx
@@ -213,9 +213,21 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-
- 147, 17
-
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+ YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+ 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+ bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+ VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+ c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+ Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+ TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+
True
@@ -250,6 +262,17 @@
IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEajz9kWk6ztXlMMpC7qxrQi7qxo
+ pakgUScFdaeuWtPkAaRu4rrJ0h8KY75xpjRmGoMfXLjMvecMA6OsCqXK2uiyYo7c6g56flwuAMKh7sxe
+ 9ueocKg6pSWmaa4HZOMimbbnNO5RFHqcYcbX5GGwl4WXJb6nDlZKMAhvtEHy2snBoiDBTu457M1Ed4pg
+ UdiZEK2/kKCZeFq/DCyKSVKGScZu1Ygj+0sMn+736G6zzvpe16DnJw3WN606m4m9ODr8fL6qbSv+dVbw
+ cNuiFhecHhv0rPsjsKxN+njXygrc2hZ7RkA0O3mz38Xwr8IuGAaLBERvz6KjDxmwXFJYJPC0TpEEM1zE
+ 1+WBJJZIGJzO+FpxfkvQl4ZFQqIeAPwXjOCTjN1Kw0//yeLX5aIo36556oHRrqKAAAAAAElFTkSuQmCC
@@ -259,22 +282,11 @@
s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
/oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
- d/+7t3/4X7/u4Z+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+ d/+7t3/4X7/uwZ+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
- ACCdLx2YNUwMAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEajz9kWk6ztXlMMpC7qKm0Rd1a0
- 0lSQqJOCulNXrWnyAmIXcZ905w+FMd84UxozjcEPLlzm3nOGgVHWhVJlY3xZMcdudQ89Py4XAOFId+IX
- e4EKR6pTWmKa5mZAti7mr50FjfsUhR5nmPE1eRjsZeFVie+pw7USDMIbbTifdXOwKEiwk3sOezPRnSJY
- FHamRBssJWimnjYoA4tikpRhkolbNZKo/SWGT/cHdL9ZZ32/Z9Dzkwbrm1adzcReEh1+Pl/VdhX/Oit4
- uG1RiwtOjw161vsRWNY2fbxrZQVubYc9IyCanbzZ72L4V2EXDINFAqK34+joQwaslhQWCTytUyTBDBfx
- dXkgSSQSBqczvlac3xL0pWGRkKhdgP+CEXySiVtp+Ok/Wf66XBTlGzBQ6rRmWjSIAAAAAElFTkSuQmCC
+ ABxqLxtW9DuCAAAAAElFTkSuQmCC
@@ -292,14 +304,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZPLSwJBHMctKiJ6XoL+gujUv+D/EkSXThHd
- GpDCzFearW1rbbm+StvcdTPzURSa9kRDL0VIl6KHeYkoUqfdmLDVJe0D38t8f59hhmFktVCSW3Kjaxcz
- Ujs2oyOgVWHeflT9jRKz95g8EX8g/fCWykEoJPlcgsz5dY7fiAAANKHRaviy0ewORS4eC99iZQ5v8sU5
- xw6GxqvR2diRo2zuU0r+CXeefVIQzgGkiCGYKC0l/U7yqQj1dr8GKWJWA8f7UlJlsM0IiRQxy+wRJyX8
- TpKP0RU0IUWM1upXnN69S4o/CWVuX5VmtxwpYkYNVCfhCb9IiUKE11lwhWg0LgYAslVN0ttkMF4wew/z
- Z/cfIjl29VxYWA+HJ2bwLqSUASZTu3aNOVgPn5RmLW73MI63zTsDkxYutr3MRuOLzAGttfmHZBA2IKUM
- 0JPdeiu7x0RTUL3i8fFyM6pqM4ZZew0Um2Bjl1BD0iEANlpQVZspHdU3T/kuuHga8sffH1dZOlBVHyrC
- s8QlMlA4gfCB0HL9KMzWwWnchQvXQEv/QCb7AsJLl64HI/ycAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNLwNBHIdLEBGvF4lPIE6+gu8iERcnETeT
+ NKSqqtTaWttautUuW6u7VpVVUmm1jZe00h6EhBOhWhcRooxdmUa33ShP8rvM7/9MZjIZXSUM1EaPldnB
+ rfS2y+oOmI24rxNVv2PAV9owb9AfSN2/JLMQKkk8fkL+9DIrb0QCAGrQaDlyWW1jpeDZQ/5bLE3oKvcx
+ 7d7G0Xg5Uy6h/+j68V1LLkQ8vc7oSU8XUtSQfJjTkoqTyHxAy4p/EilqlgLxAy2pNPh6kEKKGodwJGoJ
+ xUnIsTK7GFLUmJ1+/fHtq6ZYiJS+eTbY2B6kqBmYoZtJr5TTEpUorzPHSBwaVwMAVW+iuK3F3Wje5jt8
+ Orl7U8mRi0x+bnVvb3icaEHKDwDDGs3LfIiR4p8TdpbtI4iGWU9gxC5GthxCODrPhzizy9+rg7AKKT8A
+ C9VqcQr7fDgJTYveTVmuRVVlBnFn+wwtxITIOZykOAmAtTpUVWZ0iu6YpTfPxGgKysc/GDLam1D1N4yk
+ d0GMpaFyAuUDoeW/o7c5u8cIhlCugZb+gU73Bafvl6JCGIXLAAAAAElFTkSuQmCC
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs
index 109179b..f8bb21d 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -507,6 +507,11 @@ namespace FEQ0000
var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
}
+ else
+ {
+ var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?\n저장 버튼을 눌러야 최종 삭제 됩니다");
+ if (dlg != System.Windows.Forms.DialogResult.Yes) return;
+ }
bs.RemoveCurrent();
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
index 8efe797..015b45d 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
@@ -234,8 +234,8 @@ namespace FPJ0000
else
{
PO대상수량 += 1;
- row.ForeColor = Color.White;
- row.BackColor = Color.OrangeRed;
+ row.ForeColor = Color.Black;
+ row.BackColor = Color.Gold;
}
}
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
index bd9ccd4..89a73b2 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -331,20 +331,20 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6XpmhrY
- zVTMvM0pmtrQhUG2mEbmJVyiQhdRioIK7aJTm7c5pxvOyFymNu8X8LLUXc5x50y/PedsqYHQDz48L57z
- /XB+33ME3ATf1cRfKNarw0v0v4VyPUVOmqeUOw10eHEvHfpIZzot0yp9It7u4UM7J+RBt3bRSi+bTCaX
- xb4Oi22bZSsHjZ/zVuR9mkZ0ybBDlKHa64m6J6xQt8iFeycZGKZYGKZZ6CdZ6Cac0PxaR/OQHess0DBM
- Ie/DFJKemKh/JEJ5M7XmcKJ/xoWvMyw5WfTxEie6zOv4MuQggg30z7tgmGNQoJpG4J3213w4qjRg/Jo8
- YlNSeQVJFVdR0VKL/LpSBMp9EUAQFZxCsOI4yhrK+FVsNIuFFQeC47pYXhBZHPi+fbARjaPPUaHP4SVx
- 5aHIeRWLzNpoiKsuIrEqEQ0DC2g02fD5+xpWSU9CRTfNC0RK0V4feZZLP9KJl4MKFGkyeEl8ZRgJX0Lq
- 0xRozXZ+lbZRCmrSw4qdgTC/xy3gJqSwi5ZWJ8Bo1qHKcBsPW7MRVXoO8eURME46YCTFcgVrx9ydWIgg
- WLFDcOaenDmRexCxShH6x3pR0JkGhUqK6MdBqNV8xLdZFkZSbO8Egx7CopVB4H2P4KjMS+IvO4DMmhhc
- rwxBTNl5XiJVxUJWl0LeJAjcff+0C33cJyZYSZF+WTq3wF+2b9Zftp885AX/HC9cLgpC+rMEaIfUKFDn
- Iu1dAsSVkTASgYH8G3oioJkNItBsr3A2q5ueX6UxMOvi6RqZw63qVCSToKQqGtk1N7fuOBxOFxHUbws4
- 24xlW/A/7NwKKTsEJ6UdDuWLN5u7PbwbHR0dG4fjGmyeOCkytXV8as1h5S7GlyiML1Iwe1iyMTxc8zba
- HaYoatX7RtMPT1wgOJbaku4nbm49IlFb/CT19BbJbnz/Iq6nvcVNK4cSm9p8E1RJAoFA8AcA2Z4MAUEQ
- ugAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY
+ zVTMdDqnaGpDFwbZYhqZutJEhQxRuryo0C46tXmbc7rhjMxlavM2L+BlqbucozvTb885W2og9IMPz4vn
+ fD+c3/ccHjvB99QJF4t1qogS3e8QmY4iJ82hYE89HVHcR4c91hrPSDVlvpFv93Gh3RP6sEezaKWXjUaj
+ y2Jfh8W2w7KVhcbPeSvyPpkRUzLiEGQovTxR94QXahfZcN+UE/ppBnozA90UA+3kBtS/1tEybMc6AzSO
+ UMj7MI2kZ0bqH0mIrIVac2xgYMaFrzMMORn0c5INdJvW8WXYQQSbGJh3QT/nRIHSDP7djjdcOFoROHFd
+ FrklrryKpIprqGitQ369AnyZHwIJgoLTCJafQGljKbeKjWawsOJAcHw3wwmiivnvO4aa0DT2AhW6HE4S
+ Xx6GnFdxyKyLgajqEhKrEtE4uIAmow2fv69hlfQUIu+hOYGgTODlK8ty6Ua78HJIjiJ1BidJqAwn4ctI
+ fZ4CjcnOrdI+RkFFelixOxGS3+sWsBNa2E1LaoQwmLSo0t/Bo7ZsRCvOI6E8EoYpBwykWLZgzbi7EwsR
+ BMt3Cc7elzlP5h5CXJkAA+N9KOhKg1wpQcyTINSpP+LbLAMDKbZv0olewqLVCf4Dj+CY1FscID2IzNpY
+ 3KgMRWzpBU4iUcZBWp9C3iQI7P2A2YV+9hMTrKRI/yytWxAg3T8bID1AHvJGQI43rhQFIb1aCM2wCgWq
+ XKS9E0JUGQUDEejJv6EjAtq5SQTqnRXOZfXQ86s0BmddHN2jc7hdk4pkEhRXxSC79tb2HYtjw0UEDTsC
+ 1jZj2RH8Dzu7QsouwSlJp+Np9eutvR7ei87Ozs0j8Y02T5wUmdo2Mb3msLIXE0sUJhYpmDws2ZwcbPM2
+ 2h2mKGrV52bzD0+cxzue2pruL2ppOypWWfzFDfQ2yW78/iJqoH1EzSuHE5vb/YTKJB6Px/sD/HSeBtvD
+ pD4AAAAASUVORK5CYII=
diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs
index 3a94a9e..895e202 100644
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -275,8 +275,8 @@ namespace FPJ0000
else
{
PO대기 += 1;
- row.ForeColor = Color.White;
- row.BackColor = Color.OrangeRed;
+ row.ForeColor = Color.Black;
+ row.BackColor = Color.Gold;
}
}
else