...

2023-01-03 11:19:37 +09:00
parent 3df038909e
commit 52a2257b9e
17 changed files with 149 additions and 134 deletions
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
@@ -810,7 +810,8 @@ 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 datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");

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

--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -331,20 +331,20 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
-        Zipm3uYUTU10YZAtpqGpC01UqBCl6EWFdtGpTZ1zTjfcInOZ2pw6L+Blqbuc43am355zttRA6AcfnhfP
-        +X44v+85PHbCHiiTL1dq5NFVmt/hYg1FTppDyp5aOrpyiI58ojacE6lq/GPeHuBCeyfi8YBq2UqvGgwG
-        t8W+CYttl1UrC42fi1YUfzIjvmrcwc+R+XijnokqVy+z4aEZF7SzDLRmBpoZBuppJ5S/NtE5ZscmA7SN
-        Uyj+MIu0ZwbqH0m4uJPacDihn3Pj6xxDTgbDnMSJfuMmvow5iGAL+kU3tAsulMrMCLnf+4YLx0mDTTfF
-        MdvC+utIq7uBuq5mlLRIESIOQDCBX3oWYZJTqG6r5lax0QyW1hwIS+pnOEFsZcj73tF2tE++RJ2mkJMk
-        1Uai8HUicpvjIWi4gtSGVLSNLKHdYMPn7xtYJz2FSwZoTsCv4fv4i/Pcmok+vBqVoEKZw0mS66NI+Coy
-        n2dAZbRzq/RMUpCTHtbsLoSXDHoE7ESU99P5jSnQGdVo0N5DWXcB4qQXkVwbA92MAzpSLFuwasrTiYUI
-        wiR7BOcfil2ni44gsYYP/dQQSvuyIJHlI/5pKJqVH/FtnoGOFDs07cIgYdnqQsgjr+CEyFcYJDqM3KYE
-        3KqPQEL1JU6SL0uEqCWDvEko2Hu92Y1h9hMTrKTIwDy1RxAkOjgfJDpEHvJFUKEvrlWEIvtFClRjcpTK
-        i5D1LgWC+ljoiEBL/g0NEdCuLSJQ7q5wIW+AXlynMTLv5uifWMDdxkykk6CwIR4FTXd27lgcTjcRtO4K
-        WNucZVfwP+zsChl7BGfyFQ6xuGx7v4f3Q6FQbB1LarN546TIzG7T7IbDyl6YViiYlikYvazYXBxs8zba
-        E6Yoat3vdscPb5zHO5nZlR0o6Ow+LpRbAoWt9A7pHgL+Imil/QQda0dTO3oCUmRpPB6P9wfHCJ28kSNT
-        iAAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY
+        zVTMdDqnaGqiC4NsMa3MS2iigwpRil5UaBed2tS5zemGMzKXqc37BbwsdZdz5s7023POlhoI/eDD8+I5
+        3w/n9z2Hx07oPXXSxTK9Mqpc/ztMqqfISXNUsKeBjirroyOe6ExnJNoq/+i3+7jQ7gl/2KNdstIrJpPJ
+        bbE7YbHtsGJlofFzwYrCTzOIKx9xCLIUPt6oZyJLdEtsuG/KBcM0A8MMA/0UA93kBtS/nGgbtsPJAM0j
+        FAo/TCPlmYn6RxImbaPWHRsYmHXj6yxDTgb9nGQDGrMTX4YdRLCJgQU3DPMuFCtmEHy36w0Xjq0Imrgu
+        jd4S115FSs011LQ3oKixAsHSAAQRBMWnESo7gcrmSm4VG81gcdWB0EQNwwliyoLfdw21oGXsJWr0+Zwk
+        sToC+a8TkN0QB5H8EpLlyWgeXESLyYbP39exRnoKk/XQnEBQJfDxl+a49aPdeDUkQ6k6i5Mk1UaS8GWk
+        P0+D1mznVukco6AkPazaXQgr6vUI2Akv0dC5dUIYzTrIDXfwuCMPsRXnkVQdDeOUA0ZSLFuwdtzTiYUI
+        QmW7BGfvS10nCw4hoUqAgfE+FHdnQKbIRdzTEDSoP+LbHAMjKbZv0oVewpLVheAHXsExia+YLzmI7Pp4
+        3KgNR3zlBU6Sq0iApDGNvEkI2PuBGTf62U9MsJIiA3N0HgFfsn+OLzlAHvIFP98XV0pDkPlCCO2wEsXK
+        AmS8E0JUGwMjERjIv6EnAtq1SQTqnRXO5fTQC2s0BufcHJrRedyuS0cqCYrlccirv7V9x+LYcBNB046A
+        tc1adgT/w86ukLZLcCpX5ZBKH23t9fBeqFSqzSOJzTZvnBSZ3jExve6wshcTyxQmliiYvSzbXBxs8zba
+        E6Yoas3vZusPb5zHO57enhkoaus4KlZaAsVN9DapHgL+Imqi/UStq4eTWzsDhIoUHo/H+wPGUJ27knKs
+        TwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -863,7 +863,8 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
                FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
--- a/SubProject/FPJ0000/Project/fProjectData.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.cs
@@ -315,7 +315,8 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
                FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
@@ -434,8 +435,8 @@ namespace FPJ0000
                if (tbPath.Text.StartsWith("/")) tbPath.Text = tbPath.Text.Replace("/", "\\");
                else tbPath.Text = "\\" + tbPath.Text;
            }
-
-            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine( "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
@@ -527,7 +527,8 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine(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
@@ -739,7 +739,8 @@ namespace FPJ0000
 				else tbPath = "\\" + tbPath;
 			}
 			//\\10.131.32.29\Data
-			var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+			var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+			var serverpath = System.IO.Path.Combine(datapath, "Data", "Project");
 			if (System.IO.Directory.Exists(serverpath) == false)
 			{
 				FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
--- a/SubProject/FPJ0000/Project/fProjectSchedule.cs
+++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs
@@ -74,11 +74,11 @@ namespace FPJ0000

        void ProjectsSchedule_TableNewRow(object sender, DataTableNewRowEventArgs e)
        {
-            if (e.Row["wuid"] == null) e.Row["wuid"] = FCOMMON.info.Login.no;
-            if (e.Row["wdate"] == null) e.Row["wdate"] = DateTime.Now;
-            if (e.Row["project"] == null) e.Row["project"] = this.projectindex;
-            if (e.Row["appoval"] == null) e.Row["appoval"] = 0; //신규추가는 확정안되는 데이터이다
-            if (e.Row["no"] == null) e.Row["no"] = int.Parse(this.comboBox1.Text);
+            e.Row["wuid"] = FCOMMON.info.Login.no;
+            e.Row["wdate"] = DateTime.Now;
+            e.Row["project"] = this.projectindex;
+            e.Row["appoval"] = 0; //신규추가는 확정안되는 데이터이다
+            e.Row["no"] = int.Parse(this.comboBox1.Text);
        }

        private void fProjectSchedule_Load(object sender, EventArgs e)
@@ -361,7 +361,7 @@ namespace FPJ0000
        {
            if (int.TryParse(comboBox1.Text, out int scno) == false) return;

-            var list = this.dsPRJ.EETGW_ProjectsSchedule.Where(t => t.RowState != DataRowState.Deleted).Where(t => t.RowState != DataRowState.Detached).Where(t=>t.no == scno).OrderBy(t => t.seq).ToList();
+            var list = this.dsPRJ.EETGW_ProjectsSchedule.Where(t => t.RowState != DataRowState.Deleted).Where(t => t.RowState != DataRowState.Detached).Where(t => t.no == scno).OrderBy(t => t.seq).ToList();
            e.Graphics.Clear(Color.DimGray);
            //e.Graphics.DrawString(list.Count.ToString(), this.Font, Brushes.White, 10, 10);
            var colsize = new int[] { 50 };
@@ -677,6 +677,7 @@ namespace FPJ0000
                newdr.seq += dsPRJ.EETGW_ProjectsSchedule.Rows.Count + 1;
                newdr.title = item.memo;
                newdr.project = this.projectindex;
+
                newdr.gcode = FCOMMON.info.Login.gcode;
                dsPRJ.EETGW_ProjectsSchedule.AddEETGW_ProjectsScheduleRow(newdr);
            }
--- a/SubProject/FPJ0000/Project/fProjectSummary.cs
+++ b/SubProject/FPJ0000/Project/fProjectSummary.cs
@@ -618,7 +618,8 @@ namespace FPJ0000
                else tbPath = "\\" + tbPath;
            }
            //\\10.131.32.29\Data
-            var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project");
+            var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+            var serverpath = System.IO.Path.Combine( "Data", "Project");
            if (System.IO.Directory.Exists(serverpath) == false)
            {
                FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +