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-02-25 19:36:51 +09:00
parent dfa6ed85ca
commit 06dbd92893
9 changed files with 879 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
View File

@@ -17,7 +17,7 @@ namespace FPJ0000
{
InitializeComponent();
fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
this.dsMSSQL.JobReport.TableNewRow += Projects_TableNewRow;
//this.dsMSSQL.JobReport.TableNewRow += Projects_TableNewRow;
this.FormClosed += __Closed;
dtSD.KeyDown += dtSD_KeyDown;
@@ -46,7 +46,7 @@ namespace FPJ0000
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
List<String> fprclist = new List<string>();
foreach (dsReport.ProcessListRow dr in dtProcList)
@@ -65,15 +65,23 @@ namespace FPJ0000
// this.cmbUser.Items.Add(namestr);
UpdateUserList(); //현재사용자의 이름을 반환한다
btConf.Visible = curLevel >= 5;
btConfAll.Visible = curLevel >= 5;
this.dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
if (curLevel >= 5)
{
//dv1.EditMode = DataGridViewEditMode.EditOnKeystrokeOrF2;
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
}
else
{
cmbUser.Text = namestr;
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
//dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
}
@@ -104,12 +112,6 @@ namespace FPJ0000
//일반사용자의경우에는 상태를 변경하지 못한다.
if (curLevel >= 5)
{
}
else btEdit.Enabled = false;
//210930-
if (FCOMMON.info.NotShowJobReportview)
@@ -129,7 +131,7 @@ namespace FPJ0000
var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter();
var prclist = this.tbProcess.Tag as List<string>;
if (prclist == null || prclist.Count < 1)
if (prclist == null || prclist.Count < 1)
{
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
@@ -296,35 +298,19 @@ namespace FPJ0000
{
}
void funcSave()
{
this.Validate();
this.bs.EndEdit();
try
{
var cnt = ta.Update(this.dsMSSQL.JobReport);
util.MsgI($"{cnt}건의 자료가 저장되었습니다");
//this.tam.UpdateAll(this.dsMSSQL);
FormattingData();
}
catch (Exception ex)
{
FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
}
}
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["status"] = "진행 완료";//other
e.Row["uid"] = FCOMMON.info.Login.no; //이름을 직접 기록
e.Row["hrs"] = 8.0;
e.Row["ot"] = 0.0;
}
//void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
//{
// e.Row["gcode"] = FCOMMON.info.Login.gcode;
// e.Row["pdate"] = DateTime.Now.ToShortDateString();
// e.Row["wuid"] = FCOMMON.info.Login.no;
// e.Row["wdate"] = DateTime.Now;
// e.Row["status"] = "진행 완료";//other
// e.Row["uid"] = FCOMMON.info.Login.no; //이름을 직접 기록
// e.Row["hrs"] = 8.0;
// e.Row["ot"] = 0.0;
//}
private void refreshToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -420,7 +406,7 @@ namespace FPJ0000
private void btEdit_Click(object sender, EventArgs e)
{
funcSave();
// funcSave();
}
private void lbStt_Click(object sender, EventArgs e)
@@ -495,19 +481,64 @@ namespace FPJ0000
var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다");
if (dlg != DialogResult.Yes) return;
var sb = new System.Text.StringBuilder();
foreach (dsPRJ.JobReportRow dr in this.dsMSSQL.JobReport)
{
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
if (dr.ot2 == 0)
{
if (dr.FreeDay) dr.ot2 = dr.ot * 1.5;
else dr.ot2 = dr.ot;
sb.Append($"{dr.username}:{dr.uid} 요청:{dr.ot},승인:{dr.ot2},비고:일괄");
}
dr.EndEdit();
}
util.MsgI("모든 시간을 적용 했습니다. 적용하려면 '저장' 버튼을 누르세요");
//funcDelete();
this.Validate();
this.bs.EndEdit();
try
{
var cnt = ta.Update(this.dsMSSQL.JobReport);
dsMSSQL.JobReport.AcceptChanges();
util.MsgI($"{cnt}건의 자료가 저장되었습니다");
FCOMMON.DBM.InsertLog("OTCONFIRM", sb.ToString());
FormattingData();
}
catch (Exception ex)
{
FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
}
}
private void toolStripButton3_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.JobReportRow;
using (var f = new OtConfirm.fOTConfirmOK(dr))
{
if (f.ShowDialog() == DialogResult.OK)
{
dr.EndEdit();
try
{
var cnt = ta.Update(dr);
dr.AcceptChanges();
util.MsgI($"{cnt}건의 자료가 저장되었습니다");
FCOMMON.DBM.InsertLog("OTCONFIRM", $"{dr.username}:{dr.uid},요청:{dr.ot},승인:{dr.ot2},관리자비고:{dr.otReason}");
FormattingData();
}
catch (Exception ex)
{
FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
}
}
}
}
}
}