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

1. 입고화면의 구매담당/승인 필터 추가 및 합계금액 추가

Browse Source 
2. 구매목록의 담당/승인자 목록이 공용코드 기반에서 실데이터 기반으로 변경되었습니다.
This commit is contained in:
chi
2023-10-18 11:36:48 +09:00
parent bf4852d84b
commit 036244651b
15 changed files with 1510 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs generated
View File

@@ -857,7 +857,7 @@
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
this.fpSpread1.SetViewportLeftColumn(0, 0, 2);
this.fpSpread1.SetViewportLeftColumn(0, 0, 9);
//
// label1
//
@@ -923,7 +923,7 @@
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).Value = "*";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "비고\r\n(요청자)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "비고(구매사유)\r\n(요청자)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "입고예정";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "입고일";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "입고수량";
@@ -980,11 +980,13 @@
this.fpSpread1_Sheet1.Columns.Get(6).Label = "요청";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "requestName";
this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costcenter";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "Cost Center";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "linecode";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -1157,10 +1159,10 @@
this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(30).DataField = "bigo";
this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고\r\n(요청자)";
this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고(구매사유)\r\n(요청자)";
this.fpSpread1_Sheet1.Columns.Get(30).Tag = "bigo";
this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(30).Width = 96F;
this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20;
this.fpSpread1_Sheet1.Columns.Get(31).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -1193,11 +1195,13 @@
this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(35).Label = "비고\r\n(담당자)";
this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_manager";
this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매담당";
this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(37).DataField = "purchase_admin";
this.fpSpread1_Sheet1.Columns.Get(37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;

39
SubProject/FEQ0000/Purchase/fPurchaseNR.cs
View File

@@ -122,20 +122,27 @@ namespace FEQ0000
this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1;
//구매-담당
stList = FCOMMON.DBM.getCodeList("65");
this.cmbManager.Items.Clear();
cmbManager.Items.Add("-- 전체 --");
foreach (var item in stList)
cmbManager.Items.Add(item.Value);
this.cmbManager.SelectedIndex = 0;
//구매담당자목록
using (var tauser = new dsPurchaseTableAdapters.Purchase_ManagerlistTableAdapter())
{
var lst_man = tauser.GetByManager(FCOMMON.info.Login.gcode);
var lat_adm = tauser.GetByAdmin(FCOMMON.info.Login.gcode);
//구매-승인
stList = FCOMMON.DBM.getCodeList("66");
this.cmbAdmin.Items.Clear();
cmbAdmin.Items.Add("-- 전체 --");
foreach (var item in stList)
cmbAdmin.Items.Add(item.Value);
cmbManager.Items.Clear();
cmbAdmin.Items.Clear();
cmbManager.Items.Add("-- 전체 --");
cmbAdmin.Items.Add("-- 전체 --");
foreach (dsPurchase.Purchase_ManagerlistRow dr in lst_man)
{
cmbManager.Items.Add(dr.username);
}
foreach (dsPurchase.Purchase_ManagerlistRow dr in lat_adm)
{
cmbAdmin.Items.Add(dr.username);
}
}
this.cmbManager.SelectedIndex = 0;
this.cmbAdmin.SelectedIndex = 0;
@@ -795,7 +802,11 @@ namespace FEQ0000
| FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
| FarPoint.Excel.ExcelSaveFlags.NoFormulas
| FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName);
var a = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?");
if(a == DialogResult.Yes)
{
FCOMMON.Util.RunExplorer(sd.FileName);
}
}
}

44
SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs generated
View File

@@ -85,6 +85,7 @@
this.chkExp = new System.Windows.Forms.CheckBox();
this.btSaveAdd = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.cmbRemark = new System.Windows.Forms.ComboBox();
this.cmbCurrency = new System.Windows.Forms.ComboBox();
this.tbQtyReal = new System.Windows.Forms.TextBox();
this.tbBigoChk = new System.Windows.Forms.TextBox();
@@ -114,7 +115,6 @@
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.cmbRemark = new System.Windows.Forms.ComboBox();
this.dsPurchase = new FEQ0000.dsPurchase();
this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -444,6 +444,16 @@
label9.TabIndex = 20;
label9.Text = "해외물품은\r\n좌측 단가를 입력";
//
// label18
//
label18.AutoSize = true;
label18.Location = new System.Drawing.Point(277, 177);
label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label18.Name = "label18";
label18.Size = new System.Drawing.Size(20, 20);
label18.TabIndex = 51;
label18.Text = "\\";
//
// tbSC
//
this.tbSC.Location = new System.Drawing.Point(112, 430);
@@ -772,8 +782,19 @@
this.groupBox1.Text = "필수입력";
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
//
// cmbRemark
//
this.cmbRemark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbRemark.FormattingEnabled = true;
this.cmbRemark.Location = new System.Drawing.Point(94, 368);
this.cmbRemark.Margin = new System.Windows.Forms.Padding(4);
this.cmbRemark.Name = "cmbRemark";
this.cmbRemark.Size = new System.Drawing.Size(380, 28);
this.cmbRemark.TabIndex = 50;
//
// cmbCurrency
//
this.cmbCurrency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCurrency.FormattingEnabled = true;
this.cmbCurrency.Items.AddRange(new object[] {
"USD"});
@@ -782,7 +803,6 @@
this.cmbCurrency.Name = "cmbCurrency";
this.cmbCurrency.Size = new System.Drawing.Size(89, 28);
this.cmbCurrency.TabIndex = 50;
this.cmbCurrency.Text = "USD";
//
// tbQtyReal
//
@@ -1101,16 +1121,6 @@
this.timer1.Interval = 250;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// cmbRemark
//
this.cmbRemark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbRemark.FormattingEnabled = true;
this.cmbRemark.Location = new System.Drawing.Point(94, 368);
this.cmbRemark.Margin = new System.Windows.Forms.Padding(4);
this.cmbRemark.Name = "cmbRemark";
this.cmbRemark.Size = new System.Drawing.Size(380, 28);
this.cmbRemark.TabIndex = 50;
//
// dsPurchase
//
this.dsPurchase.DataSetName = "dsPurchase";
@@ -1125,16 +1135,6 @@
//
this.purchaseTableAdapter.ClearBeforeFill = true;
//
// label18
//
label18.AutoSize = true;
label18.Location = new System.Drawing.Point(277, 177);
label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label18.Name = "label18";
label18.Size = new System.Drawing.Size(20, 20);
label18.TabIndex = 51;
label18.Text = "\\";
//
// fPurchase_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);

30
SubProject/FEQ0000/Purchase/fPurchase_Add.cs
View File

@@ -51,6 +51,14 @@ namespace FEQ0000
ctl.KeyDown += ctl_KeyDown;
}
}
//필수로
if(FCOMMON.info.Login.gcode == "K4PM")
{
tbCostCenter.BackColor = Color.FromArgb(255, 255, 192);
tbLineCode.BackColor = Color.FromArgb(255, 255, 192);
tbManager.BackColor = Color.FromArgb(255, 255, 192);
}
}
Boolean advInput = false;
@@ -546,6 +554,28 @@ namespace FEQ0000
}
if (FCOMMON.info.Login.gcode == "K4PM")
{
if(tbCostCenter.Text.isEmpty())
{
FCOMMON.Util.MsgE("CostCenter 를 입력하세요");
tbCostCenter.Focus();
return false;
}
if (tbLineCode.Text.isEmpty())
{
FCOMMON.Util.MsgE("LineCode 를 입력하세요");
tbLineCode.Focus();
return false;
}
if (tbManager.Text.isEmpty())
{
FCOMMON.Util.MsgE("구매담당자 를 입력하세요");
tbManager.Focus();
return false;
}
}
//if (cbProcess.Text.Trim() == "")
//{

6
SubProject/FEQ0000/Purchase/fPurchase_Add.resx
View File

@@ -227,6 +227,9 @@
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<data name="tbBigo.ToolTip" xml:space="preserve">
<value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -234,9 +237,6 @@
* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
</data>
<metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<data name="tbBigoChk.ToolTip" xml:space="preserve">
<value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)