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

..

Browse Source
This commit is contained in:
chi
2022-06-02 09:34:43 +09:00
parent 6a5eb13a6c
commit 2b500ce303
4 changed files with 679 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
JobReportMailService/fJobReportDay.cs
View File

@@ -151,7 +151,8 @@ namespace JobReportMailService
var vGcode = gcodedata; var vGcode = gcodedata;
if (string.IsNullOrEmpty(vGcode)) continue; if (string.IsNullOrEmpty(vGcode)) continue;
//if (vGcode.Contains("K5") == false) continue; if (vGcode.Contains("K5") == false) continue;
var MailJD = dtMailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault(); var MailJD = dtMailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault();
if (MailJD == null) if (MailJD == null)

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다. // 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("22.05.30.1600")] [assembly: AssemblyVersion("22.06.02.0930")]
[assembly: AssemblyFileVersion("22.05.30.1600")] [assembly: AssemblyFileVersion("22.06.02.0930")]

362
Project/_Common/fAddNewUser.cs
View File

@@ -9,209 +9,209 @@ using System.Windows.Forms;
namespace Project._Common namespace Project._Common
{ {
public partial class fAddNewUser : Form // FCOMMON.fBase public partial class fAddNewUser : Form // FCOMMON.fBase
{ {
string p_dept = string.Empty; string p_dept = string.Empty;
string p_id = string.Empty; string p_id = string.Empty;
public fAddNewUser(string dept, string id) public fAddNewUser(string dept, string id)
{ {
InitializeComponent(); InitializeComponent();
p_dept = dept; p_dept = dept;
p_id = id; p_id = id;
this.tbDept.Text = dept; this.tbDept.Text = dept;
this.StartPosition = FormStartPosition.CenterScreen; this.StartPosition = FormStartPosition.CenterScreen;
this.tbId.Text = id; this.tbId.Text = id;
//자료를 불러와서 먼저 불러온다 //자료를 불러와서 먼저 불러온다
if (id.isEmpty() == false) if (id.isEmpty() == false)
{ {
tbId.Enabled = false; tbId.Enabled = false;
button1.Enabled = false; button1.Enabled = false;
textBox1.Enabled = false; textBox1.Enabled = false;
var db = new EEEntitiesMain(); var db = new EEEntitiesMain();
var db_user = db.Users.Where(t => t.id == id).FirstOrDefault(); var db_user = db.Users.Where(t => t.id == id).FirstOrDefault();
var db_guser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault(); var db_guser = db.EETGW_GroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == id).FirstOrDefault();
if (db_user != null) if (db_user != null)
{ {
tbNameK.Text = db_user.name; tbNameK.Text = db_user.name;
tbNameE.Text = db_user.nameE; tbNameE.Text = db_user.nameE;
tbDept.Text = db_user.dept; tbDept.Text = db_user.dept;
tbEmail.Text = db_user.email; tbEmail.Text = db_user.email;
tbTel.Text = db_user.tel; tbTel.Text = db_user.tel;
tbHp.Text = db_user.hp; tbHp.Text = db_user.hp;
tbDateIn.Text = db_user.indate; tbDateIn.Text = db_user.indate;
tbDateO.Text = db_user.outdate; tbDateO.Text = db_user.outdate;
tbGrade.Text = db_user.grade; tbGrade.Text = db_user.grade;
tbMemo.Text = db_user.memo; tbMemo.Text = db_user.memo;
} }
if (db_guser != null) if (db_guser != null)
{ {
tbProcess.Text = db_guser.Process; tbProcess.Text = db_guser.Process;
tbState.Text = db_guser.state; tbState.Text = db_guser.state;
//this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport); //this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
this.chkUserSt.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState); this.chkUserSt.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
} }
this.Text = "사용자 정보 변경"; this.Text = "사용자 정보 변경";
} }
else this.Text = "사용자 정보 추가"; else this.Text = "사용자 정보 추가";
} }
private void fUserInfo_Load(object sender, EventArgs e) private void fUserInfo_Load(object sender, EventArgs e)
{ {
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
//입력한 id확인해서 잇으면 해당 자료를 표시해준다. //입력한 id확인해서 잇으면 해당 자료를 표시해준다.
var id = this.tbId.Text.Trim(); var id = this.tbId.Text.Trim();
if (id.isEmpty()) if (id.isEmpty())
{ {
FCOMMON.Util.MsgE("id를 입력하세요"); FCOMMON.Util.MsgE("id를 입력하세요");
this.tbId.SelectAll(); this.tbId.SelectAll();
this.tbId.Focus(); this.tbId.Focus();
return; return;
} }
var db = new EEEntitiesMain(); var db = new EEEntitiesMain();
var dr_user = db.Users.Where(t => t.id == id).FirstOrDefault(); var dr_user = db.Users.Where(t => t.id == id).FirstOrDefault();
if (dr_user == null) if (dr_user == null)
{ {
FCOMMON.Util.MsgE("등록된 자료가 없습니다"); FCOMMON.Util.MsgE("등록된 자료가 없습니다");
tbNameK.Focus(); tbNameK.Focus();
} }
else else
{ {
tbNameK.Text = dr_user.name; tbNameK.Text = dr_user.name;
tbNameE.Text = dr_user.nameE; tbNameE.Text = dr_user.nameE;
if (tbDept.Text.isEmpty()) tbDept.Text = dr_user.dept; if (tbDept.Text.isEmpty()) tbDept.Text = dr_user.dept;
tbEmail.Text = dr_user.email; tbEmail.Text = dr_user.email;
tbTel.Text = dr_user.tel; tbTel.Text = dr_user.tel;
tbHp.Text = dr_user.hp; tbHp.Text = dr_user.hp;
tbDateIn.Text = dr_user.indate; tbDateIn.Text = dr_user.indate;
tbDateO.Text = dr_user.outdate; tbDateO.Text = dr_user.outdate;
tbGrade.Text = dr_user.grade; tbGrade.Text = dr_user.grade;
tbMemo.Text = dr_user.memo; tbMemo.Text = dr_user.memo;
tbProcess.Text = string.Empty; tbProcess.Text = string.Empty;
//부서가잇다면 해당 부서에서 해당 사용자의 공정을 찾는다 //부서가잇다면 해당 부서에서 해당 사용자의 공정을 찾는다
if (tbDept.Text.isEmpty() == false) if (tbDept.Text.isEmpty() == false)
{ {
var drGrp = db.vGroupUser.Where(t => t.id == id).FirstOrDefault(); var drGrp = db.vGroupUser.Where(t => t.id == id).FirstOrDefault();
if (drGrp != null) if (drGrp != null)
{ {
tbProcess.Text = drGrp.processs; tbProcess.Text = drGrp.processs;
} }
} }
} }
} }
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
this.Validate(); this.Validate();
var db = new EEEntitiesMain(); var db = new EEEntitiesMain();
//해당 그룹에 데이터를 추가한다. //해당 그룹에 데이터를 추가한다.
//var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault(); //var drDept = db.UserGroup.Where(t => t.dept == tbDept.Text).FirstOrDefault();
//if (drDept == null) //if (drDept == null)
//{ //{
// FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요"); // FCOMMON.Util.MsgE("해당 부서정보가 존재하지 않습니다\n\n부서를 신규로 추가할 수는 없습니다\n관리자에 문의하세요");
// return; // return;
//} //}
//해당 그룹에 해당 사용자가 존재하는지 확이한다. //해당 그룹에 해당 사용자가 존재하는지 확이한다.
var gcode = FCOMMON.info.Login.gcode; var gcode = FCOMMON.info.Login.gcode;
var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id); var uid = (p_id.isEmpty() ? tbId.Text.Trim() : p_id);
var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault(); var drGuser = db.EETGW_GroupUser.Where(t => t.gcode == gcode && t.uid == uid).FirstOrDefault();
if (drGuser != null) if (drGuser != null)
{ {
drGuser.Process = this.tbProcess.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim();
drGuser.state = this.tbState.Text.Trim(); drGuser.state = this.tbState.Text.Trim();
drGuser.useUserState = chkUserSt.Checked; drGuser.useJobReport = chkUserSt.Checked;
//drGuser.useJobReport = chkJobReport.Checked; //drGuser.useJobReport = chkJobReport.Checked;
} }
else else
{ {
//불러온경우 //불러온경우
if (tbId.Enabled == false) if (tbId.Enabled == false)
{ {
FCOMMON.Util.MsgE("사용자 ID정보가 없어 진행할 수 없습니다"); FCOMMON.Util.MsgE("사용자 ID정보가 없어 진행할 수 없습니다");
return; return;
} }
drGuser = new EETGW_GroupUser(); drGuser = new EETGW_GroupUser();
drGuser.wuid = FCOMMON.info.Login.no; drGuser.wuid = FCOMMON.info.Login.no;
drGuser.wdate = DateTime.Now; drGuser.wdate = DateTime.Now;
drGuser.gcode = gcode; drGuser.gcode = gcode;
drGuser.level = 1; drGuser.level = 1;
drGuser.uid = this.tbId.Text.Trim(); drGuser.uid = this.tbId.Text.Trim();
drGuser.state = this.tbState.Text.Trim(); drGuser.state = this.tbState.Text.Trim();
drGuser.Process = this.tbProcess.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim();
//drGuser.useJobReport = this.chkJobReport.Checked; //drGuser.useJobReport = this.chkJobReport.Checked;
drGuser.useUserState = this.chkUserSt.Checked; drGuser.useJobReport = this.chkUserSt.Checked;
db.EETGW_GroupUser.Add(drGuser); db.EETGW_GroupUser.Add(drGuser);
} }
//사용자 목록에 없다면 추가한다 //사용자 목록에 없다면 추가한다
var drUser = db.Users.SingleOrDefault(t => t.id == uid); var drUser = db.Users.SingleOrDefault(t => t.id == uid);
if (drUser == null) if (drUser == null)
{ {
drUser = new Users(); drUser = new Users();
drUser.wuid = FCOMMON.info.Login.no; drUser.wuid = FCOMMON.info.Login.no;
drUser.wdate = DateTime.Now; drUser.wdate = DateTime.Now;
drUser.gcode = gcode; drUser.gcode = gcode;
drUser.level = 1; drUser.level = 1;
drUser.id = tbId.Text.Trim(); drUser.id = tbId.Text.Trim();
drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0 drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0
drUser.name = tbNameK.Text.Trim(); drUser.name = tbNameK.Text.Trim();
drUser.nameE = tbNameE.Text.Trim(); drUser.nameE = tbNameE.Text.Trim();
drUser.dept = this.tbDept.Text.Trim(); drUser.dept = this.tbDept.Text.Trim();
drUser.email = tbEmail.Text; drUser.email = tbEmail.Text;
drUser.tel = tbTel.Text; drUser.tel = tbTel.Text;
drUser.hp = tbHp.Text; drUser.hp = tbHp.Text;
drUser.indate = tbDateIn.Text; drUser.indate = tbDateIn.Text;
drUser.outdate = tbDateO.Text; drUser.outdate = tbDateO.Text;
drUser.memo = tbMemo.Text; drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text; drUser.processs = tbProcess.Text;
db.Users.Add(drUser); db.Users.Add(drUser);
} }
else else
{ {
if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
drUser.name = tbNameK.Text.Trim(); drUser.name = tbNameK.Text.Trim();
drUser.nameE = tbNameE.Text.Trim(); drUser.nameE = tbNameE.Text.Trim();
drUser.dept = this.tbDept.Text.Trim(); drUser.dept = this.tbDept.Text.Trim();
drUser.email = tbEmail.Text; drUser.email = tbEmail.Text;
drUser.tel = tbTel.Text; drUser.tel = tbTel.Text;
drUser.hp = tbHp.Text; drUser.hp = tbHp.Text;
drUser.indate = tbDateIn.Text; drUser.indate = tbDateIn.Text;
drUser.outdate = tbDateO.Text; drUser.outdate = tbDateO.Text;
drUser.memo = tbMemo.Text; drUser.memo = tbMemo.Text;
drUser.processs = tbProcess.Text; drUser.processs = tbProcess.Text;
}
db.SaveChanges(); }
this.DialogResult = DialogResult.OK;
} db.SaveChanges();
this.DialogResult = DialogResult.OK;
private void chkUserSt_CheckedChanged(object sender, EventArgs e) }
{
}
private void chkJobReport_CheckedChanged(object sender, EventArgs e) private void chkUserSt_CheckedChanged(object sender, EventArgs e)
{ {
}
} }
private void chkJobReport_CheckedChanged(object sender, EventArgs e)
{
}
}
} }

988
Project/_Common/fUserList.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff