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

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

View File

@@ -69,8 +69,8 @@ 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)
@@ -187,12 +187,12 @@ namespace FPJ0000
var col_amtn = this.fpSpread1.ActiveSheet.Columns["amtn"].Index;
var col_qtyin = this.fpSpread1.ActiveSheet.Columns["qtyin"].Index;
var col_qtyn = this.fpSpread1.ActiveSheet.Columns["qtyn"].Index; //N대수량(전체수량)
var col_bbuy = this.fpSpread1.ActiveSheet.Columns["bbuy"].Index;
var col_breq = 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;
var PR발행전체 = 0;
var = 0;
var = 0;
var = 0;
@@ -208,19 +208,20 @@ namespace FPJ0000
var value = this.fpSpread1.ActiveSheet.GetValue(i, col_sid); //sid값을 확인한다
var value_buy = this.fpSpread1.ActiveSheet.GetValue(i, col_buy);
var value_in = this.fpSpread1.ActiveSheet.GetValue(i, col_qtyin);
var value_bbuy = this.fpSpread1.ActiveSheet.GetValue(i, col_bbuy);
var value_bbuy = this.fpSpread1.ActiveSheet.GetValue(i, col_breq); //구매요청
var value_bconf = this.fpSpread1.ActiveSheet.GetValue(i, col_bconf);//구매확정 210118
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);
Boolean bbuy = false;
// Boolean bconf = false;
Boolean breq = false;
Boolean bconf = false;
if (value_bbuy != null) bbuy = (Boolean)value_bbuy;
// if (value_bconf != null) bconf = (Boolean)value_bconf;
if (value_bbuy != null) breq = (Boolean)value_bbuy;
if (value_bconf != null) bconf = (Boolean)value_bconf;
if (bbuy) PO발행전체 += 1;
if (breq) PR발행전체 += 1;
// if (bbuy && string.IsNullOrEmpty(value_supply))
@@ -231,9 +232,9 @@ namespace FPJ0000
if (value_in != null) qty_in = (int)value_in;
if (value_buy != null) qty_buy = (int)value_buy;
if (bbuy)
if (breq)
{
if (qty_in == 0 && string.IsNullOrEmpty(value_supply))
if (qty_in == 0 && bconf == false)
{
//입고량이 0인데 공급사가 없다면 PO발행대기건
row.ForeColor = Color.White;
@@ -287,8 +288,8 @@ namespace FPJ0000
//prb6.Text = string.Format("전체 진행 ({0}/{1})", 비구매건수 + 구매완료건수, 전체건수);
//prb6.ProgressMax = 전체건수;
//prb6.ProgressValue = 비구매건수 + 구매완료건수;
prbPO.Text = string.Format("PO 대기 ({0}/{1})", PO발행, PO발행전체);
prbPO.ProgressMax = PO발행전체;
prbPO.Text = string.Format("구매입력완료[PR] ({0}/{1})", PO발행, PR발행전체);
prbPO.ProgressMax = PR발행전체;
prbPO.ProgressValue = PO발행;
prb5.Text = string.Format("비 구매 ({0}/{1})", , );
@@ -303,7 +304,7 @@ namespace FPJ0000
prb4.ProgressMax = ;
prb4.ProgressValue = ;
prb3.Text = string.Format("구매 진행 중 ({0}/{1})", , );
prb3.Text = string.Format("발주완료[PO] ({0}/{1})", , );
prb3.ProgressMax = ;
prb3.ProgressValue = ;
@@ -801,7 +802,7 @@ namespace FPJ0000
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectsRow;
var dr = drv.Row as dsPRJ.ProjectsRow;
var tbPath = dr.path;
if (tbPath == "") tbPath = "/" + tbIdx.Text;