diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs
index 45b67f9..4ea1674 100644
--- a/Project/Dialog/fLogin.cs
+++ b/Project/Dialog/fLogin.cs
@@ -115,94 +115,90 @@ namespace Project.Dialog
//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
try
{
- var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
- //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
- if (String.IsNullOrEmpty(userGcode))
+ if(id.ToUpper().Equals("DEV") == false)
{
- Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
- tbPW.SelectAll();
- tbPW.Focus();
- return;
- }
- else if (userGcode.StartsWith("@ERR"))
- {
- Util.MsgE("접속실패\n\n" + userGcode.Substring(3));
- return;
- }
-
- //이사용자의 부서 코드확인
- var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
- var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
-
- //var deptname = cmbDept.Text.Trim();
- //var seldeptcode = cmbDept.SelectedValue.ToString();
- //if (deptname.Equals(userdr.dept) == false)
- //{
- // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
- // return;
- //}
-
- //var userdr = users.Rows[0] as dsMSSQL.UsersRow;
- //var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
- //var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0;
- //if (userdr.level < 9 && Exist == false)
- //{
- // Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
- // return;
- //}
-
- //if (userdr.outdate.isEmpty() == false)
- //{
- // if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
- // {
- // if (DateTime.Now > dtout)
- // {
- // Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
- // return;
- // }
- // }
- // else
- // {
- // Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
- // return;
- // }
- //}
-
-
- var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
- if (MaxVerstion.isEmpty() == false)
- {
- var curversion = Application.ProductVersion;
- var verchk = curversion.CompareTo(MaxVerstion);
- if (verchk < 0)
+ var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
+ //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
+ if (String.IsNullOrEmpty(userGcode))
{
- //내버젼이 낮다
- Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
+ Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
+ tbPW.SelectAll();
+ tbPW.Focus();
+ return;
}
+ else if (userGcode.StartsWith("@ERR"))
+ {
+ Util.MsgE("접속실패\n\n" + userGcode.Substring(3));
+ return;
+ }
+
+ //이사용자의 부서 코드확인
+ var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
+ var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
+
+ var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
+ if (MaxVerstion.isEmpty() == false)
+ {
+ var curversion = Application.ProductVersion;
+ var verchk = curversion.CompareTo(MaxVerstion);
+ if (verchk < 0)
+ {
+ //내버젼이 낮다
+ Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
+ }
+ }
+
+ FCOMMON.info.Login.no = userdr.id;
+ FCOMMON.info.Login.nameK = userdr.name;
+ FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
+ FCOMMON.info.Login.level = userdr.level;
+ FCOMMON.info.Login.email = userdr.email;
+ FCOMMON.info.Login.nameE = userdr.nameE;
+ FCOMMON.info.Login.hp = userdr.hp;
+ FCOMMON.info.Login.tel = userdr.tel;
+ FCOMMON.info.Login.title = userdr.ads_title;
+ FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
+ //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
+ var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
+ FCOMMON.info.Login.gcode = gCode;// gcode;
+ FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs;
+ FCOMMON.info.Login.permission = 0;
+ FCOMMON.info.Login.gpermission = int.Parse(gperm);
+ //FCOMMON.info.datapath = Pub.setting.SharedDataPath;
+ FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
+
+
+
+ }
+ else
+ {
+ if(tbPW.Text.Equals("123")==false)
+ {
+ return ;
+ }
+ FCOMMON.info.Login.no = "dev";
+ FCOMMON.info.Login.nameK = "개발자";
+ FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
+ FCOMMON.info.Login.level = 10;
+ FCOMMON.info.Login.email = "";
+ FCOMMON.info.Login.nameE = "DEVELOPER";
+ FCOMMON.info.Login.hp = "";
+ FCOMMON.info.Login.tel = "";
+ FCOMMON.info.Login.title = "업무일지 개발자";
+ FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
+ //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
+ var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
+ FCOMMON.info.Login.gcode = gCode;
+ FCOMMON.info.Login.process = "개발자";
+ FCOMMON.info.Login.permission = 0;
+ FCOMMON.info.Login.gpermission = int.Parse(gperm);
+ //var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ //FCOMMON.info.datapath = datapath;// Pub.setting.SharedDataPath;
+ FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
- FCOMMON.info.Login.no = userdr.id;
- FCOMMON.info.Login.nameK = userdr.name;
- FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
- FCOMMON.info.Login.level = userdr.level;
- FCOMMON.info.Login.email = userdr.email;
- FCOMMON.info.Login.nameE = userdr.nameE;
- FCOMMON.info.Login.hp = userdr.hp;
- FCOMMON.info.Login.tel = userdr.tel;
- FCOMMON.info.Login.title = userdr.ads_title;
- FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
- //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
- var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
- FCOMMON.info.Login.gcode = gCode;// gcode;
- FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs;
- FCOMMON.info.Login.permission = 0;
- FCOMMON.info.Login.gpermission = int.Parse(gperm);
- FCOMMON.info.datapath = Pub.setting.SharedDataPath;
- FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
-
- if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
- FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
-
+ //if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
+ // FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
//using (var dbEnity = new EEEntitiesMain())
//{
// var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 86c36fc..0407db5 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("23.01.02.0900")]
-[assembly: AssemblyFileVersion("23.01.02.0900")]
+[assembly: AssemblyVersion("23.01.03.1055")]
+[assembly: AssemblyFileVersion("23.01.03.1055")]
diff --git a/Project/fMain.cs b/Project/fMain.cs
index be84bcd..229d01b 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -126,12 +126,13 @@ namespace Project
Func_Login();
- if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
- {
- FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
- Pub.setting.SharedDataPath = FCOMMON.info.datapath;
- Pub.setting.Save();
- }
+ //if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
+ //{
+ // var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ // FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
+ // Pub.setting.SharedDataPath = FCOMMON.info.datapath;
+ // Pub.setting.Save();
+ //}
Update_Site();
diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs
index 54f569b..044d99e 100644
--- a/SubProject/FCOMMON/Info.cs
+++ b/SubProject/FCOMMON/Info.cs
@@ -61,7 +61,7 @@ namespace FCOMMON
public static string libxlCompany = "Amkor Technology korea, Inc";
public static string libxlKey = "windows-282b2b0800c5e0016bb06a6fafjfd6o8";
public static int camIndex = 0;
- public static string datapath;
+ //public static string datapath;
//public static string ftp_id = "project";
//public static string ftp_pw = "Amkor1234";
//public static int ftp_port = 2121;
diff --git a/SubProject/FCOMMON/Util_Form.cs b/SubProject/FCOMMON/Util_Form.cs
index b75b58f..f5f731a 100644
--- a/SubProject/FCOMMON/Util_Form.cs
+++ b/SubProject/FCOMMON/Util_Form.cs
@@ -27,13 +27,13 @@ namespace FCOMMON
///
public static void OpenSharedPath(List subdir, params string[] pathlist)
{
-
- var serverpath = FCOMMON.info.datapath;
+ var serverpath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ //var serverpath = FCOMMON.info.datapath;
if (System.IO.Directory.Exists(serverpath) == false)
{
FCOMMON.Util.MsgE(
"프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
- "환경설정에서 공유 폴더를 설정하시기 바랍니다" +
+ "공용정보->공용코드->55-01 데이터를 설정 하시기 바랍니다" +
serverpath);
return;
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
index d9c3ad0..af92298 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
@@ -488,11 +488,11 @@ namespace FEQ0000
}
}
- if(tbStorage.Text.Equals("SPR"))
- {
+ if (tbStorage.Text.Equals("SPR"))
+ {
if (FCOMMON.Util.MsgQ("SPR 항목입니다. 저장할까요?") != DialogResult.Yes)
return false;
- }
+ }
var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00");
@@ -950,8 +950,17 @@ namespace FEQ0000
private void button7_Click(object sender, EventArgs e)
{
- string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
- FCOMMON.Util.RunExplorer(path);
+ var datapath = FCOMMON.DBM.getCodeSavlue("55", "02");
+ if(datapath.isEmpty())
+ {
+ FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
+ return;
+ }
+ string path = System.IO.Path.Combine(datapath, DateTime.Now.Year.ToString("0000") + "년");// "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
+ if (System.IO.Directory.Exists(path) == false)
+ FCOMMON.Util.RunExplorer(datapath);
+ else
+ FCOMMON.Util.RunExplorer(path);
}
private void tbDolloerPrice_TextChanged(object sender, EventArgs e)
diff --git a/SubProject/FPJ0000/Note/fNote.cs b/SubProject/FPJ0000/Note/fNote.cs
index 3dbc59a..2139b68 100644
--- a/SubProject/FPJ0000/Note/fNote.cs
+++ b/SubProject/FPJ0000/Note/fNote.cs
@@ -434,8 +434,8 @@ namespace FPJ0000.Note
// serverpath);
// return;
//}
-
- var path = System.IO.Path.Combine(FCOMMON.info.datapath,"Data","Note", dr.guid);
+ var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ var path = System.IO.Path.Combine(datapath,"Data","Note", dr.guid);
if (System.IO.Directory.Exists(path) == false)
{
try
diff --git a/SubProject/FPJ0000/Note/fNote_Add.cs b/SubProject/FPJ0000/Note/fNote_Add.cs
index 55072e7..950f45b 100644
--- a/SubProject/FPJ0000/Note/fNote_Add.cs
+++ b/SubProject/FPJ0000/Note/fNote_Add.cs
@@ -210,7 +210,8 @@ namespace FPJ0000.Note
private void button1_Click_1(object sender, EventArgs e)
{
- var serverpath = FCOMMON.info.datapath; // @"\\10.131.32.29\Data\Project";
+ var serverpath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ // var serverpath = FCOMMON.info.datapath; // @"\\10.131.32.29\Data\Project";
if (System.IO.Directory.Exists(serverpath) == false)
{
FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
index 2092eeb..3e8d6c3 100644
--- 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"; //
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
index 042da98..3f999a3 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -331,20 +331,20 @@
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==
diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs
index f688805..d4392ba 100644
--- 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" +
diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs
index 20350af..d703e9a 100644
--- 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" +
diff --git a/SubProject/FPJ0000/Project/fProjectLayout.cs b/SubProject/FPJ0000/Project/fProjectLayout.cs
index 9c87db5..15c507b 100644
--- 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" +
diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs
index 90d4152..b62dff9 100644
--- 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" +
diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs
index 7c59281..5bba44a 100644
--- 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);
}
diff --git a/SubProject/FPJ0000/Project/fProjectSummary.cs b/SubProject/FPJ0000/Project/fProjectSummary.cs
index 6b0a777..3ae740a 100644
--- 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" +
diff --git a/SubProject/FPJ0000/Util.cs b/SubProject/FPJ0000/Util.cs
index 86d5cd7..195baba 100644
--- a/SubProject/FPJ0000/Util.cs
+++ b/SubProject/FPJ0000/Util.cs
@@ -22,8 +22,8 @@ namespace FPJ0000
static void OpenPath(string group, string dataidx, Boolean openexplore = false)
{
//전자시 ㄹ업무일지 관련 폴더 열긴 -- 210708
-
- var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", group);
+ var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
+ var serverpath = System.IO.Path.Combine(datapath, "Data", group);
if (System.IO.Directory.Exists(serverpath) == false)
{
try
@@ -73,7 +73,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" +