Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

project 선택시 cr 번호도 표시되게함, cr 구매화면에서 요청자체크기능 오류 수정

Browse Source
This commit is contained in:
chi
2025-05-27 14:05:50 +09:00
parent 3b2be90cd0
commit 7ded843fe1
9 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SubProject/FBS0000/fMinutesDetail.cs
View File

@@ -40,8 +40,8 @@ namespace FBS0000
var f = new FCM0000.fLovProject("");
if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.tbPrj.Text = f.Index.ToString();
this.tbPrjName.Text = f.Title;
this.tbPrj.Text = f.val_Index.ToString();
this.tbPrjName.Text = f.val_Title;
placeTextBox.Focus();
}
}
@@ -60,8 +60,8 @@ namespace FBS0000
var f = new FCM0000.fLovProject("%" + search + "%");
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.tbPrj.Text = f.Index.ToString();
this.tbPrjName.Text = f.Title;
this.tbPrj.Text = f.val_Index.ToString();
this.tbPrjName.Text = f.val_Title;
SendKeys.Send("{TAB}");
}
}

4
SubProject/FCM0000/Inventory/fInventoryUser.cs
View File

@@ -278,8 +278,8 @@ namespace FCM0000
var f = new fLovProject("%" + inputtext + "%","%");
if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dv1.Rows[e.RowIndex].Cells["dvc_project"].Value = f.Index;
dv1.Rows[e.RowIndex].Cells["dvc_projectname"].Value = f.Title;
dv1.Rows[e.RowIndex].Cells["dvc_project"].Value = f.val_Index;
dv1.Rows[e.RowIndex].Cells["dvc_projectname"].Value = f.val_Title;
}
}
}

7
SubProject/FCM0000/Inventory/finventoryAdd.cs
View File

@@ -191,9 +191,10 @@ namespace FCM0000
var f = new FCM0000.fLovProject(search,"%");
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.tbProject.Text = f.Title;
this.tbProject.Tag = f.Title;
this.tbProjectIndex.Text = f.Index.ToString();
this.tbProject.Text = f.val_Title;
this.tbProject.Tag = f.val_Title;
this.tbProjectIndex.Text = f.val_Index.ToString();
btSave.Focus();
}
else

135
SubProject/FCM0000/fLovProject.Designer.cs generated
View File

@@ -55,12 +55,6 @@
this.tbFind = new System.Windows.Forms.ToolStripTextBox();
this.btFGind = new System.Windows.Forms.ToolStripButton();
this.dv = new System.Windows.Forms.DataGridView();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.status = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.userManager = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.reqstaffDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1 = new System.Windows.Forms.Panel();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.requestTextBox = new System.Windows.Forms.TextBox();
@@ -70,6 +64,13 @@
this.memoTextBox = new System.Windows.Forms.TextBox();
this.ta = new FCM0000.dsMSSQLTableAdapters.ProjectsTableAdapter();
this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.status = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.userManager = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.reqstaffDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.orderno = new System.Windows.Forms.DataGridViewTextBoxColumn();
pdateLabel = new System.Windows.Forms.Label();
requestLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
@@ -298,7 +299,8 @@
this.status,
this.nameDataGridViewTextBoxColumn,
this.userManager,
this.reqstaffDataGridViewTextBoxColumn});
this.reqstaffDataGridViewTextBoxColumn,
this.orderno});
this.dv.DataSource = this.bs;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
@@ -321,58 +323,6 @@
this.dv.DoubleClick += new System.EventHandler(this.dv_DoubleClick);
this.dv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv_KeyDown);
//
// idx
//
this.idx.DataPropertyName = "idx";
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.idx.DefaultCellStyle = dataGridViewCellStyle1;
this.idx.HeaderText = "IDX";
this.idx.Name = "idx";
this.idx.ReadOnly = true;
this.idx.Width = 56;
//
// sdate
//
this.sdate.DataPropertyName = "sdate";
this.sdate.HeaderText = "시작";
this.sdate.Name = "sdate";
this.sdate.ReadOnly = true;
this.sdate.Width = 61;
//
// status
//
this.status.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.status.DataPropertyName = "status";
this.status.HeaderText = "상태";
this.status.Name = "status";
this.status.ReadOnly = true;
this.status.Width = 61;
//
// nameDataGridViewTextBoxColumn
//
this.nameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
this.nameDataGridViewTextBoxColumn.HeaderText = "이름";
this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
this.nameDataGridViewTextBoxColumn.ReadOnly = true;
//
// userManager
//
this.userManager.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.userManager.DataPropertyName = "userManager";
this.userManager.HeaderText = "담당";
this.userManager.Name = "userManager";
this.userManager.ReadOnly = true;
this.userManager.Width = 80;
//
// reqstaffDataGridViewTextBoxColumn
//
this.reqstaffDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.reqstaffDataGridViewTextBoxColumn.DataPropertyName = "reqstaff";
this.reqstaffDataGridViewTextBoxColumn.HeaderText = "요청";
this.reqstaffDataGridViewTextBoxColumn.Name = "reqstaffDataGridViewTextBoxColumn";
this.reqstaffDataGridViewTextBoxColumn.ReadOnly = true;
//
// panel1
//
this.panel1.Controls.Add(pdateLabel);
@@ -468,6 +418,66 @@
this.tam.StaffTableAdapter = null;
this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// idx
//
this.idx.DataPropertyName = "idx";
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.idx.DefaultCellStyle = dataGridViewCellStyle1;
this.idx.HeaderText = "IDX";
this.idx.Name = "idx";
this.idx.ReadOnly = true;
this.idx.Width = 56;
//
// sdate
//
this.sdate.DataPropertyName = "sdate";
this.sdate.HeaderText = "시작";
this.sdate.Name = "sdate";
this.sdate.ReadOnly = true;
this.sdate.Width = 61;
//
// status
//
this.status.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.status.DataPropertyName = "status";
this.status.HeaderText = "상태";
this.status.Name = "status";
this.status.ReadOnly = true;
this.status.Width = 61;
//
// nameDataGridViewTextBoxColumn
//
this.nameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.nameDataGridViewTextBoxColumn.DataPropertyName = "name";
this.nameDataGridViewTextBoxColumn.HeaderText = "이름";
this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
this.nameDataGridViewTextBoxColumn.ReadOnly = true;
//
// userManager
//
this.userManager.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.userManager.DataPropertyName = "userManager";
this.userManager.HeaderText = "담당";
this.userManager.Name = "userManager";
this.userManager.ReadOnly = true;
this.userManager.Width = 80;
//
// reqstaffDataGridViewTextBoxColumn
//
this.reqstaffDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.reqstaffDataGridViewTextBoxColumn.DataPropertyName = "reqstaff";
this.reqstaffDataGridViewTextBoxColumn.HeaderText = "요청";
this.reqstaffDataGridViewTextBoxColumn.Name = "reqstaffDataGridViewTextBoxColumn";
this.reqstaffDataGridViewTextBoxColumn.ReadOnly = true;
//
// orderno
//
this.orderno.DataPropertyName = "orderno";
this.orderno.HeaderText = "CR/CF";
this.orderno.Name = "orderno";
this.orderno.ReadOnly = true;
this.orderno.Width = 70;
//
// fLovProject
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -517,14 +527,15 @@
private System.Windows.Forms.TextBox edateTextBox;
private System.Windows.Forms.TextBox memoTextBox;
private dsMSSQLTableAdapters.TableAdapterManager tam;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbFind;
private System.Windows.Forms.ToolStripButton btFGind;
private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn sdate;
private System.Windows.Forms.DataGridViewTextBoxColumn status;
private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn userManager;
private System.Windows.Forms.DataGridViewTextBoxColumn reqstaffDataGridViewTextBoxColumn;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripTextBox tbFind;
private System.Windows.Forms.ToolStripButton btFGind;
private System.Windows.Forms.DataGridViewTextBoxColumn orderno;
}
}

34
SubProject/FCM0000/fLovProject.cs
View File

@@ -12,8 +12,9 @@ namespace FCM0000
{
public partial class fLovProject : fBase
{
public string Title { get; set; }
public int Index { get; set; }
public string val_Title { get; set; }
public string val_OrderNo { get; set; }
public int val_Index { get; set; }
string keyword = string.Empty;
string keyword2 = string.Empty;
@@ -23,9 +24,9 @@ namespace FCM0000
InitializeComponent();
Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
Title = string.Empty;
Index = -1;
layoutmode = layout;
val_Title = string.Empty;
val_Index = -1;
layoutmode = layout;
this.keyword = search_;
this.keyword2 = stat_;
@@ -37,14 +38,14 @@ namespace FCM0000
};
}
private void fLovItem_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
// var dt = this.ta.GetSearch(this.keyword);
var statekey = this.keyword2;
if(layoutmode)
if (layoutmode)
{
this.ta.FillByLayout(this.dsMSSQL.Projects,
"%" + this.keyword + "%",
@@ -57,10 +58,13 @@ namespace FCM0000
FCOMMON.info.Login.gcode,
this.keyword2);
}
this.Show();
Application.DoEvents();
this.StartPosition = FormStartPosition.CenterScreen;
bs.Filter = "status <> '취소'";
this.dv.AutoResizeColumns();
}
private void bs_CurrentChanged(object sender, EventArgs e)
@@ -82,18 +86,20 @@ namespace FCM0000
var drv = bs.Current as DataRowView;
if (drv == null)
{
Title = string.Empty;
Index = -1;
val_Title = string.Empty;
val_OrderNo = string.Empty;
val_Index = -1;
return;
}
else
{
var dr = drv.Row as dsMSSQL.ProjectsRow;
Index = dr.idx;
Title = dr.name + "/" + dr.orderno;
val_Index = dr.idx;
val_Title = dr.name;
val_OrderNo = dr.orderno;
}
if (Title.isEmpty() || Index == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel;
if (val_Title.isEmpty() || val_Index == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel;
else DialogResult = System.Windows.Forms.DialogResult.OK;
}
@@ -113,7 +119,7 @@ namespace FCM0000
if (search.isEmpty())
{
bs.Filter = "status <> '취소'";
tbFind.BackColor = SystemColors.Control;
}
else

29
SubProject/FCM0000/fLovProject.resx
View File

@@ -148,7 +148,7 @@
<data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/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
@@ -159,7 +159,7 @@
<data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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
@@ -168,7 +168,7 @@
<data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
oAc0QjgAAAAASUVORK5CYII=
@@ -177,7 +177,7 @@
<data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/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
@@ -188,23 +188,23 @@
<data name="btOK.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
<data name="btFGind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIoSURBVDhPYxh8oLF/1qMlG/b8b5049z+IP3nBOjA7NDb5
FlgBIVDW2Pdo3Y7DQA2pYAMyimr+981e8b+xf/YTsAJcICm75H/X9CX/azun/m+bNP+/iaUd2AAHN5//
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAInSURBVDhPYxh8oKF/5qMlG/b8b5049z+IP3nBOjA7NDb5
FlgBIVDW0Pdo3Y7DQA2pYAMyimr+981e8b+hf/YTsAJcICm75H/X9CX/azun/m+bNP+/iaUd2AAHN5//
WSV1/wuqWsFiVnYuy7W0tHiAUkwgeYb58/dzFFa3eTT1zQY7Fcj+7+Ef9t/FK+B/TlnD/9i0vP8ROU3/
aycu+1/SMgUsx8XFUwXUygg2oL5+P8uU+eseLlq3639ueRMYV09c9X/K8l3/e5Zs/dU4fcP/2t75/6Nz
aycu+1/SMgUsx8XFUwXUygg2oL5+P8uUeeseLlq3639ueRMYV09c9X/K8l3/u5ds+dU4fcP/2t75/6Nz
m/+HJxeCXcjMwvIAqJUZbMDMmTNZQTZPW7zxf3Zp/X+Qn1Nyy/9HJ+f8V9PSA9sIcglMPC69AOS1f0DM
CjYgLS2N1Sc45qeFrdN/r8CI/8YWtv+19Y3/SysoPRUVFTWQlJHdKiYh9V9BSfW/qLjkf14+/v+MjIzv
gFohYQACXkFRh0EBt+vwmf+rthz43z1j2X9jS7sVIDkVdZ0VlS0T/q/dcQgsB4oRPj7+w2CNMODiFfgn
v6IZbEBaQeX/+IzC/7rG5ldBcgqKqldBMQAyIDW/4n96YfV/Dk6uP2CNMODo7vsfZgBMkZq2/k+gFKOY
pPQ7UMDBDACFBSsrGziK4cDa0Q0cz6AEBFIACkxdI7P/gkpK/AqqaldABoBiCSYHDANUA0AJxMDEEhx4
qpo6/xVV1P9Lyyr8FxYWluLhF7zNycX9n42dHRR9II0wPCgAAwMAUs0hrOeroMwAAAAASUVORK5CYII=
CjYgLS2N1Tso5qeFrdN/r8CI/8YWtv+19Y3/SykoPRUVFTWQlJHdKiYh9V9BSfW/qLjkf14+/v+MjIzv
gFohYQACXkFRh0EBt+vwmf+rthz43z1j2X9jS7sVIDkVdZ0VlS0T/q/dcQgsB4oRPj6+w2CNMODsGfAn
v6IZbEBaQeX/+IzC/7rG5ldBcgqKqldBMQAyIDW/4n96YfV/Dk6uP2CNMODo7vsfZgBMkaq2/k+gFCPQ
+e9AAQczABQWrKxs4CiGA2tHN3A8gxIQSAEoMHWNzP4LKinxK6iqXQEZAIolmBwwDFANACUQAxNLcOCp
aur8V1RR/y8tq/BfWFhYiptf8DYnF/d/NnZ2UPSBNMLwoAAMDAAuAyGa/uA2wQAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="idx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -219,6 +219,9 @@
<metadata name="userManager.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="orderno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>252, 17</value>
</metadata>

13
SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
View File

@@ -51,7 +51,7 @@ namespace FEQ0000
}
Boolean advInput = false;
private void __Load(object sender, EventArgs e)
{
@@ -451,11 +451,11 @@ namespace FEQ0000
var f = new FCM0000.fLovProject(search);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var titles = f.Title.Split('/');
this.tbProject.Text = titles[0].Trim();
this.tbProject.Tag = titles[0].Trim();
this.tbProjectIndex.Text = f.Index.ToString();
this.tbOrderNo.Text = titles[1].Trim();
this.tbProject.Text = f.val_Title.Trim();
this.tbProject.Tag = f.val_Title.Trim();
this.tbProjectIndex.Text = f.val_Index.ToString();
this.tbOrderNo.Text = f.val_OrderNo.Trim();
btSave.Focus();
}
else
@@ -1148,6 +1148,7 @@ namespace FEQ0000
else
{
Util.MsgI("SPM/NR 에서 검색된 정보가 없습니다\n저장이 가능 합니다");
dr.chk1 = true;
this.sidchk1 = sid;
}
}

6
SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
View File

@@ -513,9 +513,9 @@ namespace FEQ0000
var f = new FCM0000.fLovProject(search);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.tbProject.Text = f.Title;
this.tbProject.Tag = f.Title;
this.tbProjectIndex.Text = f.Index.ToString();
this.tbProject.Text = f.val_Title;
this.tbProject.Tag = f.val_Title;
this.tbProjectIndex.Text = f.val_Index.ToString();
btSave.Focus();
}
else

4
SubProject/FPJ0000/Project/fProjectLayout.cs
View File

@@ -407,7 +407,7 @@ namespace FPJ0000
var newdr = dt.NewEETGW_Project_LayoutRow();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.no = this.no;
newdr.project = f.Index;
newdr.project = f.val_Index;
newdr.remark = string.Empty;
newdr.reserve = string.Empty;
newdr.row = 1;
@@ -421,7 +421,7 @@ namespace FPJ0000
}
else
{
dr.project = f.Index;
dr.project = f.val_Index;
dr.EndEdit();
ta.Update(dr);
util.MsgI("프로젝트를 변경했습니다");