Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
chi
2023-01-03 11:19:37 +09:00
parent 3df038909e
commit 52a2257b9e
17 changed files with 149 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Project/Dialog/fLogin.cs
View File

@@ -114,6 +114,8 @@ namespace Project.Dialog
var id = tbID.Text.Trim();
//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
try
{
if(id.ToUpper().Equals("DEV") == false)
{
var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
//var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
@@ -134,41 +136,6 @@ namespace Project.Dialog
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)
{
@@ -197,12 +164,41 @@ namespace Project.Dialog
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.datapath = Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
}
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
}
//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();

4
Project/Properties/AssemblyInfo.cs
View File

@@ -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")]

13
Project/fMain.cs
View File

@@ -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();

2
SubProject/FCOMMON/Info.cs
View File

@@ -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;

6
SubProject/FCOMMON/Util_Form.cs
View File

@@ -27,13 +27,13 @@ namespace FCOMMON
/// <param name="pathlist"></param>
public static void OpenSharedPath(List<string> 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;
}

13
SubProject/FEQ0000/Purchase/fPurchase_Add.cs
View File

@@ -488,7 +488,7 @@ namespace FEQ0000
}
}
if(tbStorage.Text.Equals("SPR"))
if (tbStorage.Text.Equals("SPR"))
{
if (FCOMMON.Util.MsgQ("SPR 항목입니다. 저장할까요?") != DialogResult.Yes)
return false;
@@ -950,7 +950,16 @@ namespace FEQ0000
private void button7_Click(object sender, EventArgs e)
{
string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
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);
}

4
SubProject/FPJ0000/Note/fNote.cs
View File

@@ -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

3
SubProject/FPJ0000/Note/fNote_Add.cs
View File

@@ -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" +

3
SubProject/FPJ0000/Project/fPartBuyStatus.cs
View File

@@ -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"; //

28
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -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">

3
SubProject/FPJ0000/Project/fPartList.cs
View File

@@ -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" +

7
SubProject/FPJ0000/Project/fProjectData.cs
View File

@@ -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" +

3
SubProject/FPJ0000/Project/fProjectLayout.cs
View File

@@ -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" +

3
SubProject/FPJ0000/Project/fProjectList.cs
View File

@@ -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" +

13
SubProject/FPJ0000/Project/fProjectSchedule.cs
View File

@@ -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);
}

3
SubProject/FPJ0000/Project/fProjectSummary.cs
View File

@@ -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" +

7
SubProject/FPJ0000/Util.cs
View File

@@ -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" +