Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

기타근무자 관련 코드 수정

Browse Source
This commit is contained in:
ChiKyun Kim
2025-07-17 14:56:39 +09:00
parent 2806fb76ba
commit afbac3248e
26 changed files with 6166 additions and 4259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs
View File

@@ -63,6 +63,7 @@ namespace FPJ0000.JobReport_
private void fJobReport_Add_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
//사용자목록
this.bs.DataSource = dr;
@@ -74,10 +75,10 @@ namespace FPJ0000.JobReport_
//상태
var stateList = FCOMMON.DBM.getCodeTable("12");
this.cmbState.DisplayMember = "Value";
this.cmbState.ValueMember = "Value";
this.cmbState.DataSource = stateList;
this.cmbState.Text = dr.status;
this.cmbGrp26.DisplayMember = "Value";
this.cmbGrp26.ValueMember = "Value";
this.cmbGrp26.DataSource = stateList;
this.cmbGrp26.Text = dr.status;
//요청부서
var dt_request = FCOMMON.DBM.getCodeTable("13");
@@ -103,6 +104,12 @@ namespace FPJ0000.JobReport_
this.cmbjobproc.ValueMember = "Value";
this.cmbjobproc.DataSource = dt_process;
//근무형태
var dt_kunmu = FCOMMON.DBM.getCodeTable("26");
this.cmbGrp26.DisplayMember = "Value";
this.cmbGrp26.ValueMember = "Value";
this.cmbGrp26.DataSource = dt_kunmu;
if (dr.autoinput == "L") radLogin.Checked = true;
else radAuto.Checked = true;
@@ -182,18 +189,6 @@ namespace FPJ0000.JobReport_
}
tbProject.Tag = tbProject.Text;
// if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
//editor
// ed = new editform.editor();
//ed.AllowDiscAccess = true;
//ed.WindowTitle = "Quick Edit";
//ed.StartingFont = new Font("Courier New", 12.0f, FontStyle.Regular);
//ed.DisplayEditForm(this.panel1);
//ed.AllowRtf = true;
bInit = true;
}
@@ -210,13 +205,6 @@ namespace FPJ0000.JobReport_
switch (nm)
{
//case "cmbrequest":
// //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다.
// var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc");
// if (lastprocess != "") cbProcess.Text = lastprocess;
// tbSID.Focus();
// break;
case "tbdescription":
if (e.Control)
{
@@ -232,8 +220,7 @@ namespace FPJ0000.JobReport_
this.tbProject.Text = f.Title;
this.tbProject.Tag = f.Title;
this.tbProjectIndex.Text = f.Index.ToString();
tbHrs.Focus();
tbHrs.SelectAll();
if (tbProjectIndex.Tag.ToString() != f.Index.ToString() || f.Index == -1)
{
@@ -306,14 +293,7 @@ namespace FPJ0000.JobReport_
this.richTextBoxEx1.Focus();
return;
}
float hour = Single.Parse(tbHrs.Text) + Single.Parse(tbOt.Text);
if (hour == 0)
{
FCOMMON.Util.MsgE("근무시간/초과시간이 입력되지 않았습니다.");
if (tbHrs.Enabled) tbHrs.Focus();
else tbOt.Focus();
return;
}
float hour = 8f;
if (cmbjobtype.Text.Trim() == "")
{
@@ -343,24 +323,6 @@ namespace FPJ0000.JobReport_
tbProjectIndex.Text = "-1";
}
double hrs2 = 0.0;
if (double.TryParse(tbHrs.Text, out hrs2) == false)
{
FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요");
tbHrs.Focus();
tbHrs.SelectAll();
return;
}
//if(hrs2 > 8)
//{
// FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요");
// tbHrs.SelectAll();
// tbHrs.Focus();
// return;
//}
if (radAuto.Checked) dr.autoinput = "A"; //항상자동
else dr.autoinput = "L"; //로그인자동
@@ -368,7 +330,7 @@ namespace FPJ0000.JobReport_
this.dr.uid = this.cmbUser.SelectedValue.ToString();
this.dr.pdate = dts.Value.ToShortDateString();
this.dr.status = cmbState.Text;
this.dr.status = cmbGrp26.Text;
this.dr.projectName = tbProject.Text;
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
else dr.SetpidxNull();
@@ -378,34 +340,13 @@ namespace FPJ0000.JobReport_
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;
this.dr.hrs = 8f;
this.dr.SetotNull();
//완료일자 적용 - 210803 chi <= 김윤선p
if (checkBox1.Checked) dr.edate = dte.Value.ToShortDateString();
else dr.SetedateNull();
//ot 시간을 초기화한다. -- 210728 김윤선
if (double.TryParse(tbOt.Text, out double ot))
{
if (ot == 0.0)
{
this.dr.SetotNull();
}
else
{
this.dr.ot = ot;
}
}
else
{
this.dr.SetotNull();
}
if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text);
else this.dr.ot = 0;
//this.dr.description = richTextBox1.Text.Trim();
//MessageBox.Show(richTextBox1.Text);
this.dr.description = richTextBoxEx1.Text;
this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf;
@@ -442,27 +383,9 @@ namespace FPJ0000.JobReport_
var dat = myCal.GetWeekOfYear(dts.Value, myCWR, myFirstDOW);
tbWW.Text = "ww" + dat.ToString();
//공휴일이면 시간을 초기화한다.
if (tbHrs.Text == "") tbHrs.Text = "0";
if (tbOt.Text == "") tbOt.Text = "0";
float hrs = float.Parse(tbHrs.Text);
}
private void cmbUser_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void tbOt_TextChanged(object sender, EventArgs e)
{
}
private void panel1_Paint(object sender, PaintEventArgs e)
{
}
private void dte_ValueChanged(object sender, EventArgs e)
{
var myCI = new System.Globalization.CultureInfo("ko-KR");