diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index bc8c373..2118e8f 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.03.22.0830")] -[assembly: AssemblyFileVersion("21.03.22.0830")] +[assembly: AssemblyVersion("21.03.24.1200")] +[assembly: AssemblyFileVersion("21.03.24.1200")] diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index 015b45d..a7478f7 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -772,7 +772,16 @@ namespace FPJ0000 var dr = drv.Row as dsPRJ.ProjectPartStatusRow; - var serverpath = Properties.Settings.Default.SharePath + @"\Project\" + dr.Project.ToString(); + var serverpath = Properties.Settings.Default.SharePath + @"\Project"; // + + if (dr.path.isEmpty() == false) + { + if (dr.path.StartsWith("\\")) serverpath += dr.path; + else serverpath += "\\" + dr.path; + } + else serverpath += "\\" + dr.Project.ToString(); + + //+ dr.Project.ToString(); //if (tbPath == "") tbPath = "/" + dr.idx.ToString(); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 89a73b2..65998e8 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY - zVTMdDqnaGpDFwbZYhqZutJEhQxRuryo0C46tXmbc7rhjMxlavM2L+BlqbucozvTb885W2og9IMPz4vn - fD+c3/ccHjvB99QJF4t1qogS3e8QmY4iJ82hYE89HVHcR4c91hrPSDVlvpFv93Gh3RP6sEezaKWXjUaj - y2Jfh8W2w7KVhcbPeSvyPpkRUzLiEGQovTxR94QXahfZcN+UE/ppBnozA90UA+3kBtS/1tEybMc6AzSO - UMj7MI2kZ0bqH0mIrIVac2xgYMaFrzMMORn0c5INdJvW8WXYQQSbGJh3QT/nRIHSDP7djjdcOFoROHFd - FrklrryKpIprqGitQ369AnyZHwIJgoLTCJafQGljKbeKjWawsOJAcHw3wwmiivnvO4aa0DT2AhW6HE4S - Xx6GnFdxyKyLgajqEhKrEtE4uIAmow2fv69hlfQUIu+hOYGgTODlK8ty6Ua78HJIjiJ1BidJqAwn4ctI - fZ4CjcnOrdI+RkFFelixOxGS3+sWsBNa2E1LaoQwmLSo0t/Bo7ZsRCvOI6E8EoYpBwykWLZgzbi7EwsR - BMt3Cc7elzlP5h5CXJkAA+N9KOhKg1wpQcyTINSpP+LbLAMDKbZv0olewqLVCf4Dj+CY1FscID2IzNpY - 3KgMRWzpBU4iUcZBWp9C3iQI7P2A2YV+9hMTrKRI/yytWxAg3T8bID1AHvJGQI43rhQFIb1aCM2wCgWq - XKS9E0JUGQUDEejJv6EjAtq5SQTqnRXOZfXQ86s0BmddHN2jc7hdk4pkEhRXxSC79tb2HYtjw0UEDTsC - 1jZj2RH8Dzu7QsouwSlJp+Np9eutvR7ei87Ozs0j8Y02T5wUmdo2Mb3msLIXE0sUJhYpmDws2ZwcbPM2 - 2h2mKGrV52bzD0+cxzue2pruL2ppOypWWfzFDfQ2yW78/iJqoH1EzSuHE5vb/YTKJB6Px/sD/HSeBtvD - pD4AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s + ZipmOp1TNLWhC4NsMY3MG5q4gYUoSS8qtItObd7mnNtwRuYyNe83cLrUXc7Rnem355wtNRD6wYfnxXO+ + H87vew6PnZBH6sSrJXpVZKn+d6hUT5GT5ihjTwMdWaKjw59rTRckmkrfqLeHuND+CXvapzFb6VWTyeSy + 2Ddhse2xamWh8XPJivxPc4gtHXXwM5Venqh7Ioq0Zjasm3HCMMvAMMdAP8NAO70F9a9NtI3YsckAzaMU + 8j/MIvmFifpHEiptozYcWxicd+HrPENOBgOcZAu9E5v4MuIggm0MLrlgWHSiUDmHoIddb7hwTFng1G1p + 1I5IfhPJ1bdQ3V6PgsYyBEn9EEjgF55HiOwMKporuFVsNIPlNQdCEnoZThBdEvS+a7gFLeOvUK3P5SQJ + VeHIbYhHVn0shIprSFIkoXloGS0mGz5/38A66SlU1kdzAn4l38tXmu3Sj/Xg9bAMxepMTpIojyDh60ir + SYVmws6t0jlOQUV6WLM7EVrQ7xawE1bUS4trBTBOaKEwPMCzjhzElF1GYlUUjDMOGEmxbMGaSXcnFiII + ke0TXHwsdZ7NO4b4Sj4GJ3Uo7EmHTClGbHkw6tUf8W2BgZEUq5t2op9gtjoR9MQjOCXxFgVIjiKrLg53 + 5GGIq7jCScTKeEgaU8mbBIO9H5xzYYD9xAQrKdI/W+sWBEgOLwRIjpCHvBGQ640bxcHIeCmAZkSFQlUe + 0t8JIJRHw0gEBvJv6ImAdm4TgXpvhUvZffTSOo2hBRdH79gi7temIYUERYpY5NTd271jcWy5iKBpT8Da + 5i17gv9hZ1dI3Sc4J+52lNc07Bz08EF0d3dvn0hotnnipMi0jqnZDYeVvZhaoTBlpjDhYcXm5GCbt9Hu + MEVR6z53W3944jze6bT2DH9hW8dJkcriL2qid0lx4/cXYRPtI2xdO57U2uknUCbzeDzeH/pJngOO0GOv + AAAAAElFTkSuQmCC diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index e362ee1..1481d9e 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -87,6 +87,15 @@ namespace FPJ0000 { FCOMMON.Util.MsgI("신규자료는 저장을 하기 전에는 파트리스트/IO맵/주간업무등의 서브데이터를 추가할 수 없습니다."); btPart.Enabled = false; + linkLabel1.Enabled = false; + tbPath.Enabled = false; + btPart.Enabled = false; + btIO.Enabled = false; + btMailAddr.Enabled = false; + btSendMail.Enabled = false; + tabControl2.Enabled = false; + + } btIO.Enabled = btPart.Enabled; //btWeek.Enabled = btPart.Enabled;