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

재고 등록화면 프로젝트 입력칸 비활성화 => 완료

Browse Source 
재고 관리 화면 - 보관소 필터링 기능 추가
재고 관리 등록 화면 규격의 값이 없어도 등록 가능 => 완료
보관소 직접입력이 아닌 선택 하게 => 재고등록화면 수정,
품목정보에 공급처 선택 기능 => 공급처 칸(제일 우측) 추가
주문도 보관소 별로 처리 => 완료
안전용 주문등록화면 추가 => 보관소 기능 추가
구매 신청 목록에 "보관소" 열 추가
This commit is contained in:
chikyun.kim
2019-10-01 15:51:12 +09:00
parent 3acf9659e7
commit 80d00fd4b6
78 changed files with 13867 additions and 5520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
SubProject/FPJ0000/Project/fProjectData.Designer.cs generated
View File

@@ -31,8 +31,6 @@
this.components = new System.ComponentModel.Container();
System.Windows.Forms.Label nameLabel;
System.Windows.Forms.Label reqstaffLabel;
System.Windows.Forms.Label sdateLabel;
System.Windows.Forms.Label edateLabel;
System.Windows.Forms.Label usermainLabel;
System.Windows.Forms.Label usersubLabel;
System.Windows.Forms.Label userManagerLabel;
@@ -40,19 +38,17 @@
System.Windows.Forms.Label costnLabel;
System.Windows.Forms.Label costeLabel;
System.Windows.Forms.Label cntLabel;
System.Windows.Forms.Label ddateLabel;
System.Windows.Forms.Label assetLabel;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label7;
System.Windows.Forms.Label label4;
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label8;
System.Windows.Forms.Label label9;
System.Windows.Forms.Label label5;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.Label label5;
this.tbIdx = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
@@ -99,6 +95,7 @@
this.cmbPart = new System.Windows.Forms.ComboBox();
this.arLabel1 = new arCtl.arLabel();
this.panel1 = new System.Windows.Forms.Panel();
this.cmbCate = new System.Windows.Forms.ComboBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.textBox4 = new System.Windows.Forms.TextBox();
this.tbPath = new System.Windows.Forms.TextBox();
@@ -108,6 +105,10 @@
this.textBox3 = new System.Windows.Forms.TextBox();
this.arLabel3 = new arCtl.arLabel();
this.panel2 = new System.Windows.Forms.Panel();
this.linkLabel5 = new System.Windows.Forms.LinkLabel();
this.linkLabel4 = new System.Windows.Forms.LinkLabel();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.arLabel4 = new arCtl.arLabel();
this.panel3 = new System.Windows.Forms.Panel();
this.arLabel5 = new arCtl.arLabel();
@@ -133,11 +134,8 @@
this.bsSchedule = new System.Windows.Forms.BindingSource(this.components);
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter();
this.cmbCate = new System.Windows.Forms.ComboBox();
nameLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
sdateLabel = new System.Windows.Forms.Label();
edateLabel = new System.Windows.Forms.Label();
usermainLabel = new System.Windows.Forms.Label();
usersubLabel = new System.Windows.Forms.Label();
userManagerLabel = new System.Windows.Forms.Label();
@@ -145,12 +143,10 @@
costnLabel = new System.Windows.Forms.Label();
costeLabel = new System.Windows.Forms.Label();
cntLabel = new System.Windows.Forms.Label();
ddateLabel = new System.Windows.Forms.Label();
assetLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
label7 = new System.Windows.Forms.Label();
label4 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
label8 = new System.Windows.Forms.Label();
@@ -192,24 +188,6 @@
reqstaffLabel.TabIndex = 8;
reqstaffLabel.Text = "담당자";
//
// sdateLabel
//
sdateLabel.AutoSize = true;
sdateLabel.Location = new System.Drawing.Point(44, 35);
sdateLabel.Name = "sdateLabel";
sdateLabel.Size = new System.Drawing.Size(41, 12);
sdateLabel.TabIndex = 10;
sdateLabel.Text = "시작일";
//
// edateLabel
//
edateLabel.AutoSize = true;
edateLabel.Location = new System.Drawing.Point(304, 61);
edateLabel.Name = "edateLabel";
edateLabel.Size = new System.Drawing.Size(41, 12);
edateLabel.TabIndex = 12;
edateLabel.Text = "완료일";
//
// usermainLabel
//
usermainLabel.AutoSize = true;
@@ -273,15 +251,6 @@
cntLabel.TabIndex = 46;
cntLabel.Text = "수량";
//
// ddateLabel
//
ddateLabel.AutoSize = true;
ddateLabel.Location = new System.Drawing.Point(304, 35);
ddateLabel.Name = "ddateLabel";
ddateLabel.Size = new System.Drawing.Size(41, 12);
ddateLabel.TabIndex = 52;
ddateLabel.Text = "만료일";
//
// assetLabel
//
assetLabel.AutoSize = true;
@@ -321,15 +290,6 @@
label3.TabIndex = 8;
label3.Text = "IDX";
//
// label7
//
label7.AutoSize = true;
label7.Location = new System.Drawing.Point(14, 61);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(71, 12);
label7.TabIndex = 78;
label7.Text = "출고/설치일";
//
// label4
//
label4.AutoSize = true;
@@ -368,6 +328,16 @@
label9.TabIndex = 12;
label9.Text = "CR/CF#";
//
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(212, 89);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(29, 12);
label5.TabIndex = 88;
label5.Text = "분류";
//
// tbIdx
//
this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
@@ -875,6 +845,19 @@
this.panel1.Size = new System.Drawing.Size(547, 145);
this.panel1.TabIndex = 86;
//
// cmbCate
//
this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbCate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCate.FormattingEnabled = true;
this.cmbCate.Location = new System.Drawing.Point(246, 85);
this.cmbCate.Margin = new System.Windows.Forms.Padding(4);
this.cmbCate.Name = "cmbCate";
this.cmbCate.Size = new System.Drawing.Size(103, 20);
this.cmbCate.TabIndex = 89;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
@@ -1033,20 +1016,64 @@
// panel2
//
this.panel2.BackColor = System.Drawing.Color.Gainsboro;
this.panel2.Controls.Add(this.linkLabel5);
this.panel2.Controls.Add(this.linkLabel4);
this.panel2.Controls.Add(this.linkLabel3);
this.panel2.Controls.Add(this.linkLabel2);
this.panel2.Controls.Add(this.arLabel4);
this.panel2.Controls.Add(this.sdateTextBox);
this.panel2.Controls.Add(this.ddateTextBox);
this.panel2.Controls.Add(ddateLabel);
this.panel2.Controls.Add(this.edateTextBox);
this.panel2.Controls.Add(edateLabel);
this.panel2.Controls.Add(label7);
this.panel2.Controls.Add(sdateLabel);
this.panel2.Controls.Add(this.textBox1);
this.panel2.Location = new System.Drawing.Point(12, 329);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(546, 88);
this.panel2.TabIndex = 86;
//
// linkLabel5
//
this.linkLabel5.AutoSize = true;
this.linkLabel5.Location = new System.Drawing.Point(17, 61);
this.linkLabel5.Name = "linkLabel5";
this.linkLabel5.Size = new System.Drawing.Size(71, 12);
this.linkLabel5.TabIndex = 90;
this.linkLabel5.TabStop = true;
this.linkLabel5.Text = "출고/설치일";
this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked);
//
// linkLabel4
//
this.linkLabel4.AutoSize = true;
this.linkLabel4.Location = new System.Drawing.Point(307, 61);
this.linkLabel4.Name = "linkLabel4";
this.linkLabel4.Size = new System.Drawing.Size(41, 12);
this.linkLabel4.TabIndex = 89;
this.linkLabel4.TabStop = true;
this.linkLabel4.Text = "완료일";
this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked);
//
// linkLabel3
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(307, 35);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(41, 12);
this.linkLabel3.TabIndex = 88;
this.linkLabel3.TabStop = true;
this.linkLabel3.Text = "만료일";
this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked);
//
// linkLabel2
//
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(47, 37);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(41, 12);
this.linkLabel2.TabIndex = 87;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "시작일";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// arLabel4
//
this.arLabel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -1463,29 +1490,6 @@
//
this.taSchedule.ClearBeforeFill = true;
//
// cmbCate
//
this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbCate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCate.FormattingEnabled = true;
this.cmbCate.Location = new System.Drawing.Point(246, 85);
this.cmbCate.Margin = new System.Windows.Forms.Padding(4);
this.cmbCate.Name = "cmbCate";
this.cmbCate.Size = new System.Drawing.Size(103, 20);
this.cmbCate.TabIndex = 89;
//
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(212, 89);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(29, 12);
label5.TabIndex = 88;
label5.Text = "분류";
//
// fProjectData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1618,5 +1622,9 @@
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.ComboBox cmbCate;
private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.LinkLabel linkLabel3;
private System.Windows.Forms.LinkLabel linkLabel5;
private System.Windows.Forms.LinkLabel linkLabel4;
}
}

57
SubProject/FPJ0000/Project/fProjectData.cs
View File

@@ -63,7 +63,7 @@ namespace FPJ0000
try
{
if (dr.idx >= 0)
this.taSchedule.Fill(this.dsPRJ.ProjectsSchedule, this.dr.idx);
this.taSchedule.Fill(this.dsPRJ.ProjectsSchedule, this.dr.idx);
}
catch (System.Exception ex)
{
@@ -75,7 +75,7 @@ namespace FPJ0000
this.cmbCate.Text = dr.category;
//신규데이터는 추가정보를 바로 저장할 수 없다.
if(dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
{
FCOMMON.Util.MsgI("신규자료는 저장을 하기 전에는 파트리스트/IO맵/주간업무등의 서브데이터를 추가할 수 없습니다.");
btPart.Enabled = false;
@@ -115,7 +115,7 @@ namespace FPJ0000
//this.tableAdapterManager.UpdateAll(this.dsPRJ);
}
private void btMailAddr_Click(object sender, EventArgs e)
{
fMailList f = new fMailList(this.dr.idx);
@@ -125,7 +125,7 @@ namespace FPJ0000
private void btPath_Click(object sender, EventArgs e)
{
string path = tbPath.Text.Trim();
if(path == "")
if (path == "")
{
path = "\\10.131.36.205\\Data\\Projects\\";
path += tbIdx.Text;
@@ -133,7 +133,7 @@ namespace FPJ0000
}
var dlg = FCOMMON.Util.MsgQ("다음 폴더를 표시할까요?\n\n" +
path);
if(dlg == System.Windows.Forms.DialogResult.Yes)
if (dlg == System.Windows.Forms.DialogResult.Yes)
FCOMMON.Util.RunExplorer(path);
}
@@ -158,7 +158,7 @@ namespace FPJ0000
{
var drv = this.bsWeek.Current as DataRowView;
if (drv == null) return;
var dlg = FCOMMON.Util.MsgQ("선택된 업무현황을 삭제하시겠습니까?" +
var dlg = FCOMMON.Util.MsgQ("선택된 업무현황을 삭제하시겠습니까?" +
"\n\n메일이 발송 완료된 경우 발송된 메일은 삭제되지 않습니다.");
if (dlg == System.Windows.Forms.DialogResult.Yes)
this.bsWeek.RemoveCurrent();
@@ -166,7 +166,7 @@ namespace FPJ0000
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
{
var newdr = this.dsPRJ.ProjectsHistory.NewProjectsHistoryRow();
var newdr = this.dsPRJ.ProjectsHistory.NewProjectsHistoryRow();
var f = new fHistAdd(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
@@ -228,7 +228,48 @@ namespace FPJ0000
FCOMMON.info.ftp_passive);
f.ShowDialog();
}
void SelectDate(TextBox ctl)
{
DateTime dt;
var dateStr = ctl.Text.Trim();
if (dateStr == "") dateStr = DateTime.Now.ToShortDateString();
else
{
if (DateTime.TryParse(dateStr, out dt)) dateStr = dt.ToShortDateString();
else
{
FCOMMON.Util.MsgE("날짜 형식으로 변환할 수 없는 문자열 입니다.\n" +
"기준일자가 금일로 변경 됩니다");
dateStr = DateTime.Now.ToShortDateString();
}
}
dt = DateTime.Parse(dateStr);
var f = new FCOMMON.fSelectDay(dt);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
ctl.Text = f.dtPick.SelectionStart.ToShortDateString();
}
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(sdateTextBox);
}
private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(ddateTextBox);
}
private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(edateTextBox);
}
private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
SelectDate(textBox1);
}
}
}

18
SubProject/FPJ0000/Project/fProjectData.resx
View File

@@ -123,12 +123,6 @@
<metadata name="reqstaffLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sdateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="edateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="usermainLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@@ -150,9 +144,6 @@
<metadata name="cntLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="ddateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="assetLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@@ -165,9 +156,6 @@
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@@ -180,6 +168,9 @@
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
@@ -323,9 +314,6 @@
<metadata name="bsWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 17</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>773, 17</value>
</metadata>