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

사용자 목록화면 수정 및 업무일지와 적정인원 체크 박스 추가

Browse Source
This commit is contained in:
chi
2021-01-21 10:22:27 +09:00
parent 445bbe3514
commit d3778387de
57 changed files with 18406 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
SubProject/FPJ0000/Project/fPartBuyStatus.cs
View File

@@ -13,7 +13,7 @@ namespace FPJ0000
public partial class fPartBuyStatus : FCOMMON.fBase
{
string fn_fpcolsize = "";
int colidx_itemname = -1;
@@ -57,11 +57,11 @@ namespace FPJ0000
}
}
void fPartList_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape) this.Close();
else if (e.KeyCode == Keys.F5) searchpmp();
//if (e.KeyCode == Keys.Escape) this.Close();
if (e.KeyCode == Keys.F5) searchpmp();
}
void fPartList_FormClosed(object sender, FormClosedEventArgs e)
@@ -90,7 +90,7 @@ namespace FPJ0000
else if (colname == "itemunit") colidx_unit = col.Index;
}
this.Show();
this.bsPart.Sort = "bbuy,ItemSupply,qtyin";
//this.bsPart.Sort = "bbuy,ItemSupply,qtyin";
Application.DoEvents();
RefreshData();
}
@@ -109,6 +109,8 @@ namespace FPJ0000
try
{
this.taPart.Fill(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode);
//this.bsPart.Sort = "bbuy,bconfirm,userManager,project";
if(this.bsPart.Count > 0) this.bsPart.Position = 0; //210120 (박성민s)
}
catch (Exception ex)
{
@@ -144,7 +146,7 @@ namespace FPJ0000
var col_qtyn = this.fpSpread1.ActiveSheet.Columns["qtyn"].Index; //N대수량(전체수량)
var col_bbuy = this.fpSpread1.ActiveSheet.Columns["bbuy"].Index;
var col_supply = this.fpSpread1.ActiveSheet.Columns["supply"].Index;
// var col_bconf = this.fpSpread1.ActiveSheet.Columns["bconfirm"].Index;
var col_bconf = this.fpSpread1.ActiveSheet.Columns["bconfirm"].Index;
var PO발행 = 0;
var PO발행전체 = 0;
@@ -167,13 +169,13 @@ namespace FPJ0000
var db_supply = this.fpSpread1.ActiveSheet.GetValue(i, col_supply);
var value_supply = string.Empty;
if (db_supply != null) value_supply = db_supply.ToString().Trim();
//var value_bconf = this.fpSpread1.ActiveSheet.GetValue(i, col_bconf);
var value_bconf = this.fpSpread1.ActiveSheet.GetValue(i, col_bconf);
Boolean bbuy = false;
// Boolean bconf = false;
Boolean bconf = false;
if (value_bbuy != null) bbuy = (Boolean)value_bbuy;
// if (value_bconf != null) bconf = (Boolean)value_bconf;
if (value_bconf != null) bconf = (Boolean)value_bconf;
if (bbuy) PO발행전체 += 1;
// if (bbuy && string.IsNullOrEmpty(value_supply))
@@ -188,7 +190,7 @@ namespace FPJ0000
if (bbuy)
{
if (qty_in == 0 && string.IsNullOrEmpty(value_supply))
if (qty_in == 0 && bconf == false)
{
//입고량이 0인데 공급사가 없다면 PO발행대기건
row.ForeColor = Color.White;
@@ -242,19 +244,19 @@ namespace FPJ0000
//prb6.Text = string.Format("전체 진행 ({0}/{1})", 비구매건수 + 구매완료건수, 전체건수);
//prb6.ProgressMax = 전체건수;
//prb6.ProgressValue = 비구매건수 + 구매완료건수;
prbPO.Text = string.Format("PO 대기 ({0}/{1})", PO발행, PO발행전체);
prbPO.Text = string.Format("구매입력완료[PR] ({0}/{1})", PO발행, PO발행전체);
prbPO.ProgressMax = PO발행전체;
prbPO.ProgressValue = PO발행;
prb2.Text = string.Format("구매 등록 신청 ({0}/{1})", 구매등록건수, 전체건수 - 비구매건수);
prb2.ProgressMax = 전체건수 - 비구매건수;
prb2.ProgressValue = 구매등록건수;
prb3.Text = string.Format("구매 진행 중 ({0}/{1})", 구매진행건수, 구매등록건수);
prb3.Text = string.Format("발주완료[PO] ({0}/{1})", 구매진행건수, 구매등록건수);
prb3.ProgressMax = 구매등록건수;
prb3.ProgressValue = 구매진행건수;
@@ -665,7 +667,7 @@ namespace FPJ0000
//PMP조회
var drv = this.bsPart.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectsPartRow;
var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
//검색어
var title = string.IsNullOrEmpty(dr.ItemModel) ? dr.ItemName : dr.ItemModel;
@@ -700,7 +702,7 @@ namespace FPJ0000
private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e)
{
FormattingData();
}
private void btConf_Click(object sender, EventArgs e)
@@ -755,6 +757,11 @@ namespace FPJ0000
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
if (dr.IspathNull())
{
util.MsgE("공유 폴더가 생성되지 않은 프로젝트 입니다\n열람 가능한 파일이 없습니다");
return;
}
var tbPath = dr.path;
if (tbPath.Equals(""))
{
@@ -791,10 +798,11 @@ namespace FPJ0000
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
var f = new fProjectPartListEdit(dr.idx);
if(f.ShowDialog() == DialogResult.OK)
var f = new fProjectPartListEdit(dr);
if (f.ShowDialog() == DialogResult.OK)
{
this.RefreshData();
FormattingData();
}
}