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

..

Browse Source
This commit is contained in:
chi
2021-06-17 09:36:17 +09:00
parent 71b362c05b
commit 139c48721f
25 changed files with 5556 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
SubProject/FPJ0000/JobReport_/fJobReportImport.cs
View File

@@ -121,7 +121,18 @@ namespace FPJ0000.JobReport_
//날짜읽기
var colidx = 0;//
if (nuddate.Value > 0)
if (nudMon.Value > 0 && nuddate.Value > 0) //월이 지정되 ㄴ경우
{
var colidxm = (int)(nudMon.Value - 1);
colidx = (int)(nuddate.Value - 1);
var monstr = sheet.readStr(r, colidxm);
var dayval = sheet.readNum(r, colidx);
var daystr = string.Format("{0}-{1}-{2}",DateTime.Now.Year,monstr,dayval);
var dt = DateTime.Parse(daystr);
dr.pdate = dt.ToShortDateString();
}
else if (nuddate.Value > 0)
{
colidx = (int)(nuddate.Value - 1);
if (sheet.isDate(r, colidx))
@@ -200,8 +211,8 @@ namespace FPJ0000.JobReport_
{
dr.hrs = sheet.readNum(r, colidx);
}
catch { dr.hrs = 0; }
catch { dr.hrs = 0; }
}
//OT
if (nudot.Value > 0)
@@ -225,16 +236,16 @@ namespace FPJ0000.JobReport_
if (nudname.Value > 0)
{
colidx = (int)(nudname.Value - 1);
if(string.IsNullOrEmpty(dr.uid)==true)
if (string.IsNullOrEmpty(dr.uid) == true)
{
var username = sheet.readStr(r, colidx);
var users = dt_users.Select("name='" + username + "'");
if(users.Length == 1)
if (users.Length == 1)
{
dr.uid = users[0]["id"].ToString();
}
}
}
this.dsPRJ.JobReport.AddJobReportRow(dr);