장비목록 통합작업

This commit is contained in:
chi
2021-03-30 11:06:43 +09:00
parent 1efe0fa04e
commit d7a6cb25c5
34 changed files with 9131 additions and 3443 deletions

View File

@@ -34,11 +34,11 @@ namespace FPJ0000
this.cmbProcess.ValueMember = "Value";
this.cmbProcess.DataSource = dt_eetproc;
//분류 - 190903
var dt_cate = FCOMMON.DBM.getCodeTable("20", "code");
this.cmbCate.DisplayMember = "Value";
this.cmbCate.ValueMember = "Value";
this.cmbCate.DataSource = dt_cate;
//분류 - 190903 - -제거 210329(박성민)
//var dt_cate = FCOMMON.DBM.getCodeTable("20", "code");
////.cmbCate.DisplayMember = "Value";
//this.cmbCate.ValueMember = "Value";
//this.cmbCate.DataSource = dt_cate;
//공정
var dt_status = FCOMMON.DBM.getCodeTable("01");
@@ -53,18 +53,14 @@ namespace FPJ0000
this.cmbPart.DataSource = dt_part;
this.bs.DataSource = dr;
if (string.IsNullOrEmpty(dr.CMP_After) == false) rtAft.Rtf = dr.CMP_After;
if (string.IsNullOrEmpty(dr.CMP_Before) == false) rtBef.Rtf = dr.CMP_Before;
if (string.IsNullOrEmpty(dr.CMP_Description) == false) rtDesc.Rtf = dr.CMP_Description;
if (string.IsNullOrEmpty(dr.CMP_Background) == false) rtBack.Rtf = dr.CMP_Background;
//주간일지내역을 업데이트
refresh_History();
//일업무현황 업데이트
this.taHistD.Fill(this.dsPRJ.EETGW_ProjecthistoryD, this.dr.idx);
//todo 업데이트
refreshTodo();
try
{
//if (dr.idx >= 0)
@@ -79,9 +75,14 @@ namespace FPJ0000
this.cmbProcess.Text = dr.process;
this.cmbState.Text = dr.status;
this.cmbPart.Text = dr.part;
this.cmbCate.Text = dr.category;
//this.cmbCate.Text = dr.category;
this.tbDue.Text = dr.crdue;
rtAft.Text = string.Empty;
rtBef.Text = string.Empty;
rtDesc.Text = string.Empty;
rtBack.Text = string.Empty;
//신규데이터는 추가정보를 바로 저장할 수 없다.
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
{
@@ -95,8 +96,24 @@ namespace FPJ0000
btSendMail.Enabled = false;
tabControl2.Enabled = false;
}
else
{
//디비에서 조회한다.
var dtMessage = ta.GetbyIDX(dr.idx);
if(dtMessage.Rows.Count > 0)
{
var dr2 = dtMessage.Rows[0] as dsPRJ.ProjectsRow;
if (string.IsNullOrEmpty(dr2.CMP_After) == false) rtAft.Rtf = dr2.CMP_After;
if (string.IsNullOrEmpty(dr2.CMP_Before) == false) rtBef.Rtf = dr2.CMP_Before;
if (string.IsNullOrEmpty(dr2.CMP_Description) == false) rtDesc.Rtf = dr2.CMP_Description;
if (string.IsNullOrEmpty(dr2.CMP_Background) == false) rtBack.Rtf = dr2.CMP_Background;
}
}
btIO.Enabled = btPart.Enabled;
//btWeek.Enabled = btPart.Enabled;
btMailAddr.Enabled = btPart.Enabled;
@@ -123,11 +140,23 @@ namespace FPJ0000
this.dr.process = cmbProcess.Text;
this.dr.status = cmbState.Text;
this.dr.part = cmbPart.Text;
this.dr.category = cmbCate.Text;
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
//this.dr.category = cmbCate.Text;
//신규데이터일때에만 완료 자료를 처리한다.
//if(this.dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
//{
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
//}
//else
//{
// //직접데이터를 저장한다.
// var taq = new dsPRJTableAdapters.QueriesTableAdapter();
// var ucnt = taq.UpdateProjectCompleteMessage(rtBack.Rtf, rtDesc.Rtf, rtBef.Rtf, rtAft.Rtf, dr.idx);
//}
this.dr.crdue = tbDue.Text.Trim();
@@ -428,94 +457,7 @@ namespace FPJ0000
this.bsHistDay.RemoveCurrent();
}
private void toolStripButton15_Click(object sender, EventArgs e)
{
refreshTodo();
}
void refreshTodo()
{
taToDo.Fill(this.dsPRJ.EETGW_ProjectToDo, this.dr.idx);
this.dataGridView3.AutoResizeColumns();
updatetimetable();
formmatingdata();
}
private void toolStripButton12_Click(object sender, EventArgs e)
{
//add
var newdr = this.dsPRJ.EETGW_ProjectToDo.NewEETGW_ProjectToDoRow();
newdr.pidx = this.dr.idx;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
this.dsPRJ.EETGW_ProjectToDo.AddEETGW_ProjectToDoRow(newdr);
}
private void toolStripButton14_Click(object sender, EventArgs e)
{
//delete
this.bsTodo.RemoveCurrent();
}
void updatetimetable()
{
this.panel9.Invalidate();
}
void formmatingdata()
{
//색상을 변경해준다. (그룹은 자료가 있으나, 항목에 자료가 없다면 타이틀이다)
foreach (DataGridViewRow dr in this.dataGridView3.Rows)
{
var o_grp = dr.Cells[1].Value;
var o_item = dr.Cells[4].Value;
var v_grp = string.Empty;
var v_item = string.Empty;
if (o_grp != null) v_grp = o_grp.ToString();
if (o_item != null) v_item = o_item.ToString();
if (v_grp.Equals("") == false && v_item.Equals(""))
dr.DefaultCellStyle.BackColor = System.Drawing.Color.White;
else
dr.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(220, 220, 220);
}
}
private void toolStripButton13_Click_1(object sender, EventArgs e)
{
//save
try
{
this.Validate();
this.bsTodo.EndEdit();
var cnt = taToDo.Update(this.dsPRJ.EETGW_ProjectToDo);
this.dataGridView3.AutoResizeColumns();
updatetimetable();
}
catch (Exception ex)
{
FCOMMON.Util.MsgE(ex.Message);
}
}
private void panel9_Paint(object sender, PaintEventArgs e)
{
//타임테이블을 그린다.
e.Graphics.Clear(System.Drawing.Color.Black);
e.Graphics.DrawString("time table", this.Font, System.Drawing.Brushes.White, 10, 10);
var lst = this.dsPRJ.EETGW_ProjectToDo.Where(t => t.title == null).OrderBy(t => t.sort).ToList();
if (lst.Count < 1) return;
var strh = panel9.Height / lst.Count;
for (int i = 0; i < lst.Count; i++)
{
var y = strh * i;
e.Graphics.DrawLine(System.Drawing.Pens.Yellow, 0, y, panel9.Width, y);
}
foreach (dsPRJ.EETGW_ProjectToDoRow dr in lst)
{
e.Graphics.DrawString(dr.title, this.Font, System.Drawing.Brushes.Black, 10, 10);
}
}
}
}