This commit is contained in:
chi
2023-06-22 10:07:11 +09:00
parent 772cf9faeb
commit b04b79b5f5
27 changed files with 4487 additions and 4575 deletions

View File

@@ -298,7 +298,7 @@ namespace FPJ0000.JobReport_
{
//신규자료가 아니라면 7일간만 편집을 허용한다
var enableBlock = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.jobreport_editblock);
if(enableBlock)
if (enableBlock)
{
var writedate = DateTime.Now - DateTime.Parse(dr.pdate);
if (writedate.TotalDays > 7)
@@ -601,16 +601,23 @@ namespace FPJ0000.JobReport_
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;
if (getKisulInput)
{
//기술금액을 계산해야함
var price = FCOMMON.DBM.getCodeFvalue("51", cmb_kisullv.Text);
var amt = (dr.hrs + dr.ot) * price;
this.dr.kisuldiv = cmb_kisuldiv.Text;
this.dr.kisullv = cmb_kisullv.Text;
this.dr.kisulamt =(Decimal)amt; // Decimal.Parse(textBox1.Text);
textBox1.Text = amt.ToString();
}
//this.dr.description = richTextBox1.Text.Trim();
//MessageBox.Show(richTextBox1.Text);
@@ -762,7 +769,7 @@ namespace FPJ0000.JobReport_
this.richTextBoxEx1.rtb.ForeColor = Color.Black;
this.richTextBoxEx1.rtb.AppendText(oldtext);
}
//this.richTextBoxEx1.Text += oldtext;
//this.richTextBoxEx1.Text += oldtext;
//this.richTextBoxEx1.Text += oldtext;