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

8
SubProject/FPJ0000/Project/fProjectList.cs
View File

@@ -127,7 +127,7 @@ namespace FPJ0000
if (state.EndsWith("(") == false) state += ",";
state += "'완료'";
}
if(chk완료보고.Checked)
if (chk완료보고.Checked)
{
if (state.EndsWith("(") == false) state += ",";
state += "'완료(보고)'";
@@ -146,7 +146,7 @@ namespace FPJ0000
// var orgQuery = this.ta.Adapter.SelectCommand.CommandText;
string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects";
//string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects";
string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and ";
@@ -521,7 +521,7 @@ namespace FPJ0000
this.prb1.ProgressMax = 100;
this.prb1.ProgressValue = perc;
}
try
{
taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx);
@@ -705,7 +705,7 @@ namespace FPJ0000
else tbPath = "\\" + tbPath;
}
//\\10.131.32.29\Data
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" +