기술료부분 추가

This commit is contained in:
chi
2021-10-13 16:41:43 +09:00
parent d0c514824e
commit 92efb1e0a2
15 changed files with 1166 additions and 1055 deletions

View File

@@ -36,6 +36,7 @@ namespace FPJ0000.JobReport_
}
copyMOde = copy;
this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged;
this.grpkisul.Visible = getKisulInput;
}
void tbProject_SelectedIndexChanged(object sender, EventArgs e)
@@ -60,7 +61,15 @@ namespace FPJ0000.JobReport_
}
}
private bool getKisulInput
{
get
{
return FCOMMON.Util.getBit(
FCOMMON.info.Login.gpermission,
(int)FCOMMON.eGroupPermission.jobreport_kisul);
}
}
private void fJobReport_Add_Load(object sender, EventArgs e)
{
//사용자목록
@@ -105,6 +114,21 @@ namespace FPJ0000.JobReport_
this.cmbProcess.ValueMember = "Value";
this.cmbProcess.DataSource = dt_process;
if(getKisulInput)
{
//기술분류
var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50");
this.cmb_kisuldiv.DisplayMember = "Value";
this.cmb_kisuldiv.ValueMember = "Value";
this.cmb_kisuldiv.DataSource = dt_kisuldiv;
//기술레벨
var dt_kisullv = FCOMMON.DBM.getCodeTable("51");
this.cmb_kisullv.DisplayMember = "Value";
this.cmb_kisullv.ValueMember = "Value";
this.cmb_kisullv.DataSource = dt_kisullv;
}
//담당자목록
var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
@@ -123,6 +147,14 @@ namespace FPJ0000.JobReport_
cmbProcess.SelectedValue = dr.process;
tbTag.Text = dr.tag;
if (getKisulInput)
{
cmb_kisuldiv.Text = dr.kisuldiv;
cmb_kisullv.Text = dr.kisullv;
textBox1.Text = dr.kisulamt.ToString();
}
if (dr.IsotStartNull()) dateTimePicker1.Value = DateTime.Now;
else dateTimePicker1.Value = dr.otStart;
if (dr.IsotEndNull()) dateTimePicker2.Value = DateTime.Now;
@@ -449,6 +481,14 @@ namespace FPJ0000.JobReport_
this.dr.type = cmbType.Text;
this.dr.process = cmbProcess.Text;
this.dr.tag = tbTag.Text.Trim();
if(getKisulInput)
{
this.dr.kisuldiv = cmb_kisuldiv.Text;
this.dr.kisullv = cmb_kisullv.Text;
this.dr.kisulamt = Decimal.Parse(textBox1.Text);
}
if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
else this.dr.hrs = 0;