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

toshortstring -> tostring

Browse Source
This commit is contained in:
ChiKyun Kim
2025-12-19 08:23:13 +09:00
parent ab46ccb924
commit b1c3bbac42
76 changed files with 324 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SubProject/FBS0000/Holiday/WorkTable.cs
View File

@@ -20,7 +20,7 @@ namespace FBS0000
Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToShortDateString();// DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");// DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToString("yyyy-MM-dd");
tbSD.Text = sd;
tbED.Text = ed;
@@ -68,7 +68,7 @@ namespace FBS0000
cols.Add(curDate.Day.ToString("00") + "\r\n" + curDate.DayOfWeek.ToString().Substring(0, 3));
coltag.Add(curDate);
if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
if (curDate.ToString("yyyy-MM-dd") == ed.ToString("yyyy-MM-dd")) break;
}
cols.AddRange(new string[] { $"발생\n~{sd.AddDays(-1).ToString("MM/dd")}", "사용", $"잔여\n~{ed.ToString("MM/dd")}" });
coltag.AddRange(new DateTime[] { initdate, initdate, initdate });
@@ -159,8 +159,8 @@ namespace FBS0000
}
//이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999", "%");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToShortDateString(), "999999", "%");
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToString("yyyy-MM-dd"), "999999", "%");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToString("yyyy-MM-dd"), "999999", "%");
var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -177,7 +177,7 @@ namespace FBS0000
var curDate = sd.AddDays(c - 4);
var bholy = false;
//이날짜가 휴일인지 체크한다.
var drHoly = HolyList.Where(t => t.pdate == curDate.ToShortDateString()).FirstOrDefault();
var drHoly = HolyList.Where(t => t.pdate == curDate.ToString("yyyy-MM-dd")).FirstOrDefault();
if (drHoly != null && drHoly.free)
{
@@ -209,9 +209,9 @@ namespace FBS0000
//입사일이면 메세지 추가
if (item.indate == curDate.ToShortDateString())
if (item.indate == curDate.ToString("yyyy-MM-dd"))
fpSpread1_Sheet1.Cells[rowindex, c].Note += "입사";
if (item.outdate == curDate.ToShortDateString())
if (item.outdate == curDate.ToString("yyyy-MM-dd"))
fpSpread1_Sheet1.Cells[rowindex, c].Note += "퇴사";
//현재인원값
@@ -220,16 +220,16 @@ namespace FBS0000
// Boolean usePerson = true;
//
//if (bIndate == true && curDate.ToShortDateString().CompareTo(dtIn.ToShortDateString()) < 0)
//if (bIndate == true && curDate.ToString("yyyy-MM-dd").CompareTo(dtIn.ToString("yyyy-MM-dd")) < 0)
// usePerson = false;
//if (bOutdate == true && curDate.ToShortDateString().CompareTo(dtOut.ToShortDateString()) > 0)
//if (bOutdate == true && curDate.ToString("yyyy-MM-dd").CompareTo(dtOut.ToString("yyyy-MM-dd")) > 0)
// usePerson = false;
ps[3] = bholy ? 1 : 0;
ps[2] += 1;
//근태기록에 자료가 있는지 확인한다.
var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToString("yyyy-MM-dd").CompareTo(curDate.ToString("yyyy-MM-dd")) <= 0 && t.edate.ToString("yyyy-MM-dd").CompareTo(curDate.ToString("yyyy-MM-dd")) >= 0)).FirstOrDefault();
if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null) //휴일이 아니여야 한다
{
@@ -263,7 +263,7 @@ namespace FBS0000
}
//근태 시작일자가 조회시작일보다 적다면, 데이터가 걸쳐진 것이므로 회색으로 처리하자 2308320
if (dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
if (dr.sdate.ToString("yyyy-MM-dd").CompareTo(sd.ToString("yyyy-MM-dd")) < 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DimGray;
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.White;
@@ -271,11 +271,11 @@ namespace FBS0000
if (string.IsNullOrEmpty(dr.contents) == false)
{
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToString("yyyy-MM-dd")}~{dr.edate.ToString("yyyy-MM-dd")}";
}
else if (dr.sdate.ToShortDateString() != dr.edate.ToShortDateString())
else if (dr.sdate.ToString("yyyy-MM-dd") != dr.edate.ToString("yyyy-MM-dd"))
{
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}) 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}) 기간:{dr.sdate.ToString("yyyy-MM-dd")}~{dr.edate.ToString("yyyy-MM-dd")}";
}
//else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
@@ -284,7 +284,7 @@ namespace FBS0000
ps[0] += 1;
var pdate = curDate.ToShortDateString();
var pdate = curDate.ToString("yyyy-MM-dd");
if (pdate == "2022-02-07" && item.empno == "66630")
{
@@ -335,7 +335,7 @@ namespace FBS0000
var celltag = fpSpread1_Sheet1.Cells[rowindex, c].Tag;
if (celltag == null) //다른곳에서 지정했다면 처리하지 않는다.
{
if (DateTime.Now.ToShortDateString().CompareTo(pdate) > 0)
if (DateTime.Now.ToString("yyyy-MM-dd").CompareTo(pdate) > 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].Value = "--";
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.Red;
@@ -482,8 +482,8 @@ namespace FBS0000
var f = new FCOMMON.fSelectMonth();
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
tbSD.Text = sdDate.ToShortDateString();
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
tbSD.Text = sdDate.ToString("yyyy-MM-dd");
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.RefreshData();
}
@@ -517,8 +517,8 @@ namespace FBS0000
var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
sd = sd.AddMonths(-1);
var ed = sd.AddMonths(1).AddDays(-1);
tbSD.Text = sd.ToShortDateString();
tbED.Text = ed.ToShortDateString();
tbSD.Text = sd.ToString("yyyy-MM-dd");
tbED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripButton5_Click(object sender, EventArgs e)
@@ -526,8 +526,8 @@ namespace FBS0000
var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
sd = sd.AddMonths(1);
var ed = sd.AddMonths(1).AddDays(-1);
tbSD.Text = sd.ToShortDateString();
tbED.Text = ed.ToShortDateString();
tbSD.Text = sd.ToString("yyyy-MM-dd");
tbED.Text = ed.ToString("yyyy-MM-dd");
}
private void btXls_Click(object sender, EventArgs e)

6
SubProject/FBS0000/Holiday/fErrorChk.cs
View File

@@ -20,7 +20,7 @@ namespace FBS0000.Holiday
//dtSD.KeyDown += dtSD_KeyDown;
//dtED.KeyDown += dtSD_KeyDown;
tbDate.Text = DateTime.Now.ToShortDateString();
tbDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
}
private void fErrorChk_Load(object sender, EventArgs e)
{
@@ -63,7 +63,7 @@ namespace FBS0000.Holiday
{
var CD = sd.AddDays(idx++);
if (CD > ed) break;
var pdate = CD.ToShortDateString();
var pdate = CD.ToString("yyyy-MM-dd");
tbDate.Text = pdate;
Application.DoEvents();
@@ -383,7 +383,7 @@ namespace FBS0000.Holiday
var CD = DateTime.Parse(lv.SubItems[0].Text);
//if (CD > ed) break;
var pdate = CD.ToShortDateString();
var pdate = CD.ToString("yyyy-MM-dd");
cmd.Parameters["pdate"].Value = pdate;
tbDate.Text = pdate;
Application.DoEvents();

12
SubProject/FBS0000/Holiday/fHolyDayData.cs
View File

@@ -31,7 +31,7 @@ namespace FBS0000
if (cmbUser.SelectedIndex < 0)
cmbUser.SelectedIndex = 0;
this.tbMon.Text = DateTime.Now.ToShortDateString();
this.tbMon.Text = DateTime.Now.ToString("yyyy-MM-dd");
cmbType.SelectedIndex = 0; //일기준으로한다
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
if (curLevel < 5) cmbUser.Enabled = false;
@@ -68,12 +68,12 @@ namespace FBS0000
var uid = GetUIDValue();
if (cmbType.SelectedIndex == 0)
{
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
}
else if (cmbType.SelectedIndex == 1) //대체
{
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_Time);
dsReport.Holydata_Day.AcceptChanges();
@@ -82,7 +82,7 @@ namespace FBS0000
else //PMS
{
var tapms = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
tapms.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
tapms.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
dsReport.Holydata_Day.AcceptChanges();
@@ -140,14 +140,14 @@ namespace FBS0000
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(-1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void toolStripButton7_Click(object sender, EventArgs e)
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void reportViewer1_Load(object sender, EventArgs e)

12
SubProject/FBS0000/Holiday/fHolyDayDataSum.cs
View File

@@ -30,7 +30,7 @@ namespace FBS0000
//if (cmbUser.SelectedIndex < 0)
// cmbUser.SelectedIndex = 0;
this.tbMon.Text = DateTime.Now.ToShortDateString();
this.tbMon.Text = DateTime.Now.ToString("yyyy-MM-dd");
cmbType.SelectedIndex = 0; //일기준으로한다
}
@@ -82,12 +82,12 @@ namespace FBS0000
var uid = curLevel >= 5 ? "%" : FCOMMON.info.Login.no; // GetUIDValue();
if (cmbType.SelectedIndex == 0)
{
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
}
else if(cmbType.SelectedIndex == 1)
{
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_Time);
dsReport.Holydata_Day.AcceptChanges();
@@ -96,7 +96,7 @@ namespace FBS0000
else //pms
{
var taPMS = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
dsReport.Holydata_Day.AcceptChanges();
@@ -151,14 +151,14 @@ namespace FBS0000
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(-1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void toolStripButton7_Click(object sender, EventArgs e)
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void reportViewer1_Load(object sender, EventArgs e)

26
SubProject/FBS0000/Holiday/fHolyday.cs
View File

@@ -45,7 +45,7 @@ namespace FBS0000
im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToString("yyyy-MM-dd");
//현재 사용자의 그룹명을 가져옴
var taQuery = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -137,7 +137,7 @@ namespace FBS0000
var sd = DateTime.Parse(dtSD.Text + " 00:00:00");
var ed = DateTime.Parse(dtED.Text + " 23:59:59");
//sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00"));
//this.tbSD.Text = sd.ToShortDateString();
//this.tbSD.Text = sd.ToString("yyyy-MM-dd");
try
{
@@ -188,8 +188,8 @@ namespace FBS0000
var fistdate = dr.sdate.ToString("yyyy-01-01");
//이 사용자의 이전까지의 잔량을 가져온다
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"),"%");
var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"));
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToString("yyyy-MM-dd"), dr.idx.ToString("000000"),"%");
var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToString("yyyy-MM-dd"), dr.idx.ToString("000000"));
var jand = yjand + dr.termDr - dr.term;
var janh = yjanh + dr.DrTime - dr.CrTime;
this.fpSpread1.ActiveSheet.Cells[i, col_yjand].Value = yjand;
@@ -298,8 +298,8 @@ namespace FBS0000
////이 사용자의 이전까지의 잔량을 가져온다
//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 yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToString("yyyy-MM-dd"),"999999");
//var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToString("yyyy-MM-dd"), "999999");
@@ -586,8 +586,8 @@ namespace FBS0000
var f = new FCOMMON.fSelectMonth();
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.RefreshData();
}
@@ -702,7 +702,7 @@ namespace FBS0000
{
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
dtED.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
}
private void toolStripButton8_Click(object sender, EventArgs e)
@@ -710,8 +710,8 @@ namespace FBS0000
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
dtSD.Text = sd.ToString("yyyy-MM-dd");
dtED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripButton9_Click(object sender, EventArgs e)
@@ -719,8 +719,8 @@ namespace FBS0000
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
dtSD.Text = sd.ToString("yyyy-MM-dd");
dtED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripLabel3_Click(object sender, EventArgs e)

2
SubProject/FBS0000/Holiday/fImpKunTae.cs
View File

@@ -70,7 +70,7 @@ namespace FBS0000.Holiday
if (buffer.Length > 6) crtime = buffer[6].Trim();
float.TryParse(crtime, out float val_crtime);
var lv = this.listView1.Items.Add(val_date.ToShortDateString());
var lv = this.listView1.Items.Add(val_date.ToString("yyyy-MM-dd"));
lv.SubItems.Add(vno);
lv.SubItems.Add(vcate);
lv.SubItems.Add(drday.ToString());

6
SubProject/FBS0000/Holiday/fTimeTransfer.cs
View File

@@ -47,8 +47,8 @@ namespace FBS0000.Holiday
cn.Open();
var cmd = new System.Data.SqlClient.SqlCommand("", cn);
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = stime.ToShortDateString();
cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = etime.ToShortDateString();
cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = stime.ToString("yyyy-MM-dd");
cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = etime.ToString("yyyy-MM-dd");
//근태입력자료확인
cmd.CommandText = "SELECT holyday.uid, Users.name,\r\nsum( Holyday.DrTime) AS Dr," +
@@ -128,7 +128,7 @@ namespace FBS0000.Holiday
}
var ed = dateTimePicker1.Value;
if (UTIL.MsgQ($"{chkitems.Count}건의 자료를 {ed.ToShortDateString()}일자로 등록할까요?\n구분은 '대체'로 입력됩니다") != DialogResult.Yes)
if (UTIL.MsgQ($"{chkitems.Count}건의 자료를 {ed.ToString("yyyy-MM-dd")}일자로 등록할까요?\n구분은 '대체'로 입력됩니다") != DialogResult.Yes)
return;
var sumjan = 0.0;

28
SubProject/FBS0000/Holiday/fyeonchastate.cs
View File

@@ -45,7 +45,7 @@ namespace FBS0000
im2.Put(new FarPoint.Win.Spread.Keystroke(Keys.Enter, Keys.None), FarPoint.Win.Spread.SpreadActions.MoveToNextColumnWrap);
dtSD.Text = DateTime.Now.ToString("yyyy") + "-01-01";
dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString();
dtED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToString("yyyy-MM-dd");
//현재 사용자의 그룹명을 가져옴
var taQuery = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -134,7 +134,7 @@ namespace FBS0000
var sd = DateTime.Parse(dtSD.Text + " 00:00:00");
var ed = DateTime.Parse(dtED.Text + " 23:59:59");
//sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00"));
//this.tbSD.Text = sd.ToShortDateString();
//this.tbSD.Text = sd.ToString("yyyy-MM-dd");
try
{
@@ -185,8 +185,8 @@ namespace FBS0000
var fistdate = dr.sdate.ToString("yyyy-01-01");
//이 사용자의 이전까지의 잔량을 가져온다
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"),"년차");
//var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToShortDateString(), dr.idx.ToString("000000"));
var yjand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToString("yyyy-MM-dd"), dr.idx.ToString("000000"),"년차");
//var yjanh = qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, dr.uid, fistdate, dr.sdate.ToString("yyyy-MM-dd"), dr.idx.ToString("000000"));
var jand = yjand + dr.termDr - dr.term;
//var janh = yjanh + dr.DrTime - dr.CrTime;
this.fpSpread1.ActiveSheet.Cells[i, col_jand].Value = jand;
@@ -295,8 +295,8 @@ namespace FBS0000
////이 사용자의 이전까지의 잔량을 가져온다
//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 yjand = 0;// qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, this.seluid, fistdate, newdr.sdate.ToString("yyyy-MM-dd"),"999999");
//var yjanh = 0;// qta.WorkUserJan_YesterDay_Time(FCOMMON.info.Login.gcode, seluid, fistdate, newdr.sdate.ToString("yyyy-MM-dd"), "999999");
@@ -417,7 +417,7 @@ namespace FBS0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
//var sd = DateTime.Now.ToString("yyyy-MM-01");
//var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
//var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToString("yyyy-MM-dd");
var f = new WorkTable();
f.Show();
}
@@ -579,8 +579,8 @@ namespace FBS0000
var f = new FCOMMON.fSelectMonth();
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.RefreshData();
}
@@ -695,7 +695,7 @@ namespace FBS0000
{
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
dtED.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
}
private void toolStripButton8_Click(object sender, EventArgs e)
@@ -703,8 +703,8 @@ namespace FBS0000
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(-1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
dtSD.Text = sd.ToString("yyyy-MM-dd");
dtED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripButton9_Click(object sender, EventArgs e)
@@ -712,8 +712,8 @@ namespace FBS0000
var sdo = DateTime.Parse(dtSD.Text);
var sd = DateTime.Parse(sdo.AddMonths(1).ToString("yyyy-MM-01"));
var ed = sd.AddMonths(1).AddDays(-1);
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
dtSD.Text = sd.ToString("yyyy-MM-dd");
dtED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripLabel3_Click(object sender, EventArgs e)

8
SubProject/FBS0000/Holiday/rHolidaySummary.cs
View File

@@ -28,7 +28,7 @@ namespace FBS0000
{
EnsureVisibleAndUsableSize();
this.tbMon.Text = DateTime.Now.ToShortDateString();
this.tbMon.Text = DateTime.Now.ToString("yyyy-MM-dd");
refrehData();
// this.reportViewer1.RefreshReport();
@@ -38,7 +38,7 @@ namespace FBS0000
{
var dt = DateTime.Parse(this.tbMon.Text);
ta.Fill(this.dsReport.holydata, FCOMMON.info.Login.gcode, dt.Year.ToString("0000") + "-01-01", dt.ToShortDateString());
ta.Fill(this.dsReport.holydata, FCOMMON.info.Login.gcode, dt.Year.ToString("0000") + "-01-01", dt.ToString("yyyy-MM-dd"));
//데이터를 재 집계한다.
this.dsReport.holydatasum.Clear();
@@ -385,14 +385,14 @@ namespace FBS0000
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(-1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void toolStripButton7_Click(object sender, EventArgs e)
{
var sdo = DateTime.Parse(this.tbMon.Text);
var sd = sdo.AddMonths(1);
tbMon.Text = sd.ToShortDateString();
tbMon.Text = sd.ToString("yyyy-MM-dd");
}
private void reportViewer1_Load(object sender, EventArgs e)