This commit is contained in:
chi
2021-12-29 00:30:27 +09:00
parent 5aa0cf84a0
commit 9871904e9d
12 changed files with 442 additions and 348 deletions

View File

@@ -247,33 +247,46 @@ namespace FBS0000
newdr.contents = string.Empty;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
this.dsMSSQL.Holyday.AddHolydayRow(newdr);
var rowindex = this.bs.Count - 1;
newdr.UserName = FCOMMON.info.Login.nameK;
//잔액및 성명찾기
//모든데이터의 성명을 표시해준다
var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index;
var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index;
var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index;
var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index;
var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index;
var f = new fHolyday_Add(newdr);
if (f.ShowDialog() == DialogResult.OK)
{
newdr.EndEdit();
this.dsMSSQL.Holyday.AddHolydayRow(newdr);
}
else newdr.Delete();
var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault();
var username = drUser == null ? string.Empty : drUser.name;
fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username;
//이 사용자의 이전까지의 잔량을 가져온다
var fistdate = newdr.sdate.ToString("yyyy-01-01");
var yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToShortDateString(),"999999");
var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999");
//var rowindex = this.bs.Count - 1;
////잔액및 성명찾기
////모든데이터의 성명을 표시해준다
//var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
//var col_name = this.fpSpread1.ActiveSheet.Columns["name"].Index;
//var col_jand = this.fpSpread1.ActiveSheet.Columns["jand"].Index;
//var col_yjand = this.fpSpread1.ActiveSheet.Columns["yjand"].Index;
//var col_janh = this.fpSpread1.ActiveSheet.Columns["janh"].Index;
//var col_yjanh = this.fpSpread1.ActiveSheet.Columns["yjanh"].Index;
//var drUser = this.dsMSSQL.EETGW_WorkTableUser.Where(t => t.empno == newdr.uid).FirstOrDefault();
//var username = drUser == null ? string.Empty : drUser.name;
//fpSpread1.ActiveSheet.Cells[rowindex, col_name].Value = username;
////이 사용자의 이전까지의 잔량을 가져온다
//var fistdate = newdr.sdate.ToString("yyyy-01-01");
//var yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToShortDateString(),"999999");
//var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToShortDateString(), "999999");
//var jand = yjand + dr.termDr - dr.term;
//var janh = yjanh + dr.DrTime - dr.CrTime;
this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand;
this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjanh].Value = yjanh;
////var jand = yjand + dr.termDr - dr.term;
////var janh = yjanh + dr.DrTime - dr.CrTime;
//this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjand].Value = yjand;
//this.fpSpread1.ActiveSheet.Cells[rowindex, col_yjanh].Value = yjanh;
}
@@ -289,14 +302,14 @@ namespace FBS0000
private void dv1_DoubleClick(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMSSQL.vHoliday_uselistRow;
var f = new fHolyday_Add(dr.idx);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
RefreshData();
}
//var drv = this.bs.Current as DataRowView;
//if (drv == null) return;
//var dr = drv.Row as dsMSSQL.vHoliday_uselistRow;
//var f = new fHolyday_Add(dr.idx);
//if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
//{
// RefreshData();
//}
}
@@ -534,5 +547,19 @@ namespace FBS0000
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
this.RefreshData();
}
private void toolStripButton2_Click_1(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMSSQL.HolydayRow;
var f = new fHolyday_Add(dr);
if (f.ShowDialog() == DialogResult.OK)
{
dr.EndEdit();
}
else dr.RejectChanges();
}
}
}