업무일지 메일 발송 로직에서. 휴일 체크 루틴 버그 수정

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

View File

@@ -388,15 +388,29 @@ namespace FPJ0000
var dr = db.EETGW_Project_Layout.Where(t => t.no == this.no && t.project == this.project).FirstOrDefault();
if (dr == null)
{
util.MsgE("기존 레이아웃 자료를 확인 할 수 없습니다");
//없으면 추가 해야하마
var newdr = new EETGW_Project_Layout();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.no = this.no;
newdr.project = f.Index;
newdr.remark = string.Empty;
newdr.reserve = string.Empty;
newdr.row = 1;
newdr.col = 1;
newdr.rowspan = 1;
newdr.colspan = 1;
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
db.EETGW_Project_Layout.Add(newdr);
db.SaveChanges();
}
else
{
dr.project = f.Index;
db.SaveChanges();
util.MsgI("프로젝트를 변경했습니다");
refreshData();
}
refreshData();
}
}
@@ -502,7 +516,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" +