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

2021-05-28 11:34:30 +09:00
parent e1dce272bb
commit ba02049737
88 changed files with 7522 additions and 2224 deletions
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
@@ -770,9 +770,9 @@ namespace FPJ0000
            var drv = this.bsPart.Current as DataRowView;
            if (drv == null) return;
            var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
+            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");

-
-            var serverpath = Properties.Settings.Default.SharePath + @"\Project"; //
+          //  var serverpath = Properties.Settings.Default.SharePath + @"\Project"; //

            if (dr.path.isEmpty() == false)
            {
--- a/SubProject/FPJ0000/Project/fProjectData.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.cs
@@ -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" +
--- a/SubProject/FPJ0000/Project/fProjectLayout.cs
+++ b/SubProject/FPJ0000/Project/fProjectLayout.cs
@@ -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" +
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -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" +
--- a/SubProject/FPJ0000/Project/fProjectList.resx
+++ b/SubProject/FPJ0000/Project/fProjectList.resx
@@ -230,34 +230,34 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIkFrTKUtcmLY0WGChF
-        SKESs3ZTl5qMigpL15TLXClrrcWoTLd0MjV1aUv6al9mX7Zbm5utrYzu6e6zQ3fLn+oFDwf3fp6HNx/e
-        1H9jdHxE2+0ADNb30Pcv4FTfG2iZV4/FsYTe0aiuZ2RpsedRBGZXGF1DYVCJ1C9kq/b0ECdmJDDu6Pds
-        L3XG2wSDRwf9iBYnXfXkZ43pGcSMhG73VzLvm78Kxn8F5tlLoJCFYDh8eW7dAtNwmMwzoSyeEDIlGA5d
-        9EkKKiwKVRmzGyWdcqi7FBI/ZR0Pil1pwvEUNOemVgsqLMUqZXMR1zjcgNbRRpSe30mCAv1jwXSBfTIE
-        +0QQzukg3n5Zxr72CVKg7i1WKfQ7OO39Wuw1laKwOQ/ylq0Y8IZgFTTO/r3B609xlLV4oWJ2lZfQcq7e
-        WQMZnc8V0DnbjXcWEU+uwDbJEq+d/5ICsgW/gY1XlfUglN1FqLyxH8ccR7CF3sRtpjduEzZqtX1ALLEC
-        xxSLu9NpUYNPWCwn115Wc60cercWR+1VKKTzuNyGdFigaeAdlr79xD1feoOHs/whOWdYZErdqYSsLR8F
-        +hzkntiwGhbQ3VwgBYN8UAiTglv8Q2TyIhCDxuhd9w60118iyhe4noaJ1+3nC4RAtmTt7t9iRkId8xyR
-        5R9gYyl8jiQRYBOg9hg8yJas7oFdzEg4bp4fq+7wJ6o75lB5wYcDZ9fu5R+hqD9WXyzOjc3mIgAAAABJ
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVKkFrTKUtcmLY0WGChF
+        SKESs3bThpqMigpL15TLXClrrcWoNLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68
+        qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3rDMCdmJDDu6Pdc
+        L3Xa2wKDRwf9qBYnXI3kZ53pGcSMhB73VzLvn78Cxn8Z5tmLoJCDYDh0aW7NAtNImMyzoSyeELIlGA5e
+        8EkKqiwKVQWzC2Vdcqi7FRI/ZZ0Iil0ZwvE0NGenVwqqLKUqZUsJ1zzShLaxZpSf20GCAgPjwUyBfSoE
+        +2QQzpkg3n5JYG/HJClQ95WqFPR2TnuvHntM5Sg+VQB56xYMekOwCppg/97g9ac4Klq9UDE7K8toOdfo
+        rIOMLuSK6LxtxtuLiKeWYZtiidfOf0kB2YLfwMarxnoAyp4SVF/fh6OOw9hEb+A20uu3Chu12T4gllyG
+        Y5rFnZmMqKEnLBKp1ZfVXK2E3q3FEXsNiukCLr8pExZoGXyHpW8/cdeX2WB4lj8k52MW2VJ3KSFrL0SR
+        Pg/5x9ethAV0NxZIwRAfFMKk4Cb/ENm8CMSgMXrXvAPttZeI8gWup2Hidfv5AiGQq80d7t9iRkID8xyR
+        xA+wsTQ+R1IIsElQuw0e5ErWcN8uZiQcM8+P13b6k7Wdc6g+78P+M6v38o9Q1B9KNyzJq/t++QAAAABJ
        RU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ
-        Eg8mGi9gosGEgweQGBAlAXmoySQYBXkLypCwGUIwsA0QhqxiGdvsHkw6gY52fazr+vW/UUVNTHx802/6
-        yP/z/T1K/bdWRouWQiNntfAvXhs7GfC/OLI/0F+U95PfFOVNTpbsM3GKcndaVMPIADDIlfXuc1qJIzpZ
-        loq4LqjfHFu4poRcFSHm1bHzJk5R9HBxwtAVqNFGSMFmSOwTyKFBGGmeZCVh6CLxzu57ehscx6WYIQtt
-        4hTl6z4qZLQdArch6W+F8KEGW3NliM9fBe+tBb98C/zSTWx7KokrSGccfEPHRRMnAQPFWlreAE+3YXux
-        HtzUDcjcLKkqmNWz98T3DrLjeQYKFRPPdnBCy82fUYllQJdyoC4zUGMPQNN9sDnd6Jhg0TO9DocnjOze
-        TJwEtFlShi5DF9xI83Zom4NIbbRDiTTAu9yJ0QUOa58lfNpUMRsQML70BSO2Jt3EyV+wWtSMJkDbsiHF
-        deWqKuFayMFK9DtjWImKmGNlOIMSZoi9MRW9b1mYOEV5mgoVQ+MJ/BTqejOUUA2BKyD5Lufa9sdVOANJ
-        TPuTmGBELIRVdE1F9wJW7xbE5ASd8M/0ZJJrHRB9DyEyjRA/1qGXzLyyLmHKtwtn/S6iwjq2uhfA1OVf
-        Z+oPd9N3DsU99QXKj349fF+f9QtYJJCLVTBPqtvei6hpsBr2qlMXzYjfq8XOHrA62OoBsou+mRgeO1yZ
-        6oYOwzveDndrqfC8PL/UPPrnell15orr0SU+aG/B2O0Syfz8d3pWfrB0vPq07Lh3bm8X/yaK+gpWVSQu
-        F4AiQgAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy
+        JB5MNF7ARIMJBw8sMSBiAmFRIyJGQXZBKRJaQwgG2gJCkY44dHNaSmUqMGWms3Q6nefXMoqamLi8zMss
+        +X7vvwz131oZLVgKjZzVwr/YN3Yy4H9xZH+gvyDnJ78pyJmcLNpn4hTl6rSohpEGYJAr493nlBJDZLIk
+        uea8oH5zdOGaEnKWhZhXx86bOEXRw4VxQ1egRhogBZsgsU8ghwZhpHiSlYChi8Q7u++pbXAcl2SGLLSJ
+        U5S3+6iQ1nYI3IqEvwXCh2pszZUgNn8VvKcG/HIV+KWb2HaXE5eRzjh4h46LJk4CBgq1lLwBnm7F9mId
+        uKkbkLlZUlUwq2fu8e8dZMZzD+QrJp7p4ISWnT+tEsuALmVBXWagRu+BpvtgdbjQMcGiZ3oddncYmb2Z
+        OAlotSQNXYYuuJDibdA2B5HcaIeydhee5U6MLnDwfZbwaVPFbEDA+NIXjFgbdBMnf6HNoqY1AdqWFUmu
+        K1tVCddADpaj3xHFSkTEHCvDEZQwQ+yJquh9y8LEKcrdmK8YGk/gp1DXm6CEqglcBsl7Odu2P6bCEUhg
+        2p/ABCNiIayiayqyF7B6Jy8qx+m4b7onnfB1QPTeh8g0QPxYi14y88q6hCnvLpzxuzUVbWOrewFMbe51
+        pu5wN337UMxdl6f86NfDjfqsX8AigZysgnlS3fpeRFX9Q8NWceqiGfF7NdvYA212tnKA7KJvJopHdke6
+        sv6x4Rlvh6ulWHhemltsHv1zvaw4c8X54BIftDVj7FaRZH7+Oz0rPVg8Xnlattef29vFv4mivgJKfyQk
+        67tT2wAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">