1. 업무일지 작업형태 선택 ui 변경

2. 작업형태 목록 편집 UI 추가
3. 스케쥴 관련메일 발송주기를 15분에서 30분으로 변경하고 18시 이후에는 발송하지 않게 한다(최근 오류메세지가 수신된다)
This commit is contained in:
chi
2025-01-03 09:09:25 +09:00
parent c810348fa6
commit 4593c6fd74
25 changed files with 1644 additions and 664 deletions

View File

@@ -93,15 +93,15 @@ namespace FPJ0000.JobReport_
//타입
var dt_type = FCOMMON.DBM.getCodeTable("15");
this.cmbType.DisplayMember = "Value";
this.cmbType.ValueMember = "Value";
this.cmbType.DataSource = dt_type;
this.cmbjobtype.DisplayMember = "Value";
this.cmbjobtype.ValueMember = "Value";
this.cmbjobtype.DataSource = dt_type;
//공정
var dt_process = FCOMMON.DBM.getCodeTable("16");
this.cmbProcess.DisplayMember = "Value";
this.cmbProcess.ValueMember = "Value";
this.cmbProcess.DataSource = dt_process;
this.cmbjobproc.DisplayMember = "Value";
this.cmbjobproc.ValueMember = "Value";
this.cmbjobproc.DataSource = dt_process;
if (dr.autoinput == "L") radLogin.Checked = true;
else radAuto.Checked = true;
@@ -130,8 +130,10 @@ namespace FPJ0000.JobReport_
tbProject.Text = dr.projectName;
cmbRequest.SelectedValue = dr.requestpart;
cmbPackage.SelectedValue = dr.package;
cmbType.SelectedValue = dr.type;
cmbProcess.SelectedValue = dr.process;
cmbjobtype.SelectedValue = dr.type;
cmbjobproc.SelectedValue = dr.process;
cmbjobgrp.SelectedValue = dr.jobgrp;
tbTag.Text = dr.tag;
//if (cmbRequest.Text == "") cmbRequest.Text = "EE1";
@@ -253,10 +255,10 @@ namespace FPJ0000.JobReport_
this.cmbPackage.Text = predr["package"].ToString(); //190506
if (predr["type"] != DBNull.Value)
this.cmbType.Text = predr["type"].ToString(); //190506
this.cmbjobtype.Text = predr["type"].ToString(); //190506
if (predr["process"] != DBNull.Value)
cmbProcess.Text = predr["process"].ToString(); //190506
cmbjobproc.Text = predr["process"].ToString(); //190506
}
}
}
@@ -298,7 +300,7 @@ namespace FPJ0000.JobReport_
tbProject.Focus();
return;
}
if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
if (cmbjobtype.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
{
FCOMMON.Util.MsgE("진행 내용이 없습니다.");
this.richTextBoxEx1.Focus();
@@ -313,16 +315,16 @@ namespace FPJ0000.JobReport_
return;
}
if (cmbType.Text.Trim() == "")
if (cmbjobtype.Text.Trim() == "")
{
FCOMMON.Util.MsgE("업무형태를 선택하세요");
cmbType.Focus();
cmbjobtype.Focus();
return;
}
if (cmbProcess.Text.Trim() == "")
if (cmbjobproc.Text.Trim() == "")
{
FCOMMON.Util.MsgE("공정을 선택하세요");
cmbProcess.Focus();
cmbjobproc.Focus();
return;
}
if (cmbUser.SelectedIndex < 0)
@@ -372,8 +374,9 @@ namespace FPJ0000.JobReport_
else dr.SetpidxNull();
this.dr.requestpart = cmbRequest.Text;
this.dr.package = cmbPackage.Text;
this.dr.type = cmbType.Text;
this.dr.process = cmbProcess.Text;
this.dr.type = cmbjobtype.Text;
this.dr.process = cmbjobproc.Text;
this.dr.jobgrp = cmbjobgrp.Text;
this.dr.tag = tbTag.Text.Trim();
if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
else this.dr.hrs = 0;
@@ -412,20 +415,20 @@ namespace FPJ0000.JobReport_
private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
{
if (cmbType.Text.Trim() != "" &&
cmbType.SelectedIndex >= 0 &&
cmbProcess.SelectedIndex < 0 &&
if (cmbjobtype.Text.Trim() != "" &&
cmbjobtype.SelectedIndex >= 0 &&
cmbjobproc.SelectedIndex < 0 &&
cmbUser.SelectedValue != null)
{
//공정을 자동선택해준다.
//마지막 데이터를 찾아서 공정등의 정보를 업데이트한다.
var uid = cmbUser.SelectedValue.ToString();
var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim());
var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbjobtype.Text.Trim());
if (lastDt != null && lastDt.Rows.Count > 0)
{
var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
if (predr["process"] != DBNull.Value)
cmbProcess.Text = predr["process"].ToString(); //190506
cmbjobproc.Text = predr["process"].ToString(); //190506
}
}
}