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-05-28 11:34:30 +09:00
parent e1dce272bb
commit ba02049737
88 changed files with 7522 additions and 2224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SubProject/FPJ0000/Project/fProjectData.cs
View File

@@ -96,14 +96,14 @@ namespace FPJ0000
btSendMail.Enabled = false;
tabControl2.Enabled = false;
}
else
{
//디비에서 조회한다.
var dtMessage = ta.GetbyIDX(dr.idx);
if(dtMessage.Rows.Count > 0)
if (dtMessage.Rows.Count > 0)
{
var dr2 = dtMessage.Rows[0] as dsPRJ.ProjectsRow;
if (string.IsNullOrEmpty(dr2.CMP_After) == false) rtAft.Rtf = dr2.CMP_After;
@@ -111,7 +111,7 @@ namespace FPJ0000
if (string.IsNullOrEmpty(dr2.CMP_Description) == false) rtDesc.Rtf = dr2.CMP_Description;
if (string.IsNullOrEmpty(dr2.CMP_Background) == false) rtBack.Rtf = dr2.CMP_Background;
}
}
btIO.Enabled = btPart.Enabled;
@@ -145,10 +145,10 @@ namespace FPJ0000
//신규데이터일때에만 완료 자료를 처리한다.
//if(this.dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
//{
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
this.dr.CMP_After = rtAft.Rtf;
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
//}
//else
//{
@@ -156,7 +156,7 @@ namespace FPJ0000
// var taq = new dsPRJTableAdapters.QueriesTableAdapter();
// var ucnt = taq.UpdateProjectCompleteMessage(rtBack.Rtf, rtDesc.Rtf, rtBef.Rtf, rtAft.Rtf, dr.idx);
//}
this.dr.crdue = tbDue.Text.Trim();
@@ -329,7 +329,7 @@ namespace FPJ0000
else tbPath.Text = "\\" + tbPath.Text;
}
var serverpath = Properties.Settings.Default.SharePath + "\\Project";
var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data","Project");
if (System.IO.Directory.Exists(serverpath) == false)
{
FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +