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

4
Project/Dialog/fLogin.cs
View File

@@ -85,8 +85,8 @@ namespace Project.Dialog
{
DateTime dt = DateTime.Now;
//if(tbID.Text != "dev" && (dt.ToShortDateString() == "2025-04-05" ||
// dt.ToShortDateString() == "2025-04-06"))
//if(tbID.Text != "dev" && (dt.ToString("yyyy-MM-dd") == "2025-04-05" ||
// dt.ToString("yyyy-MM-dd") == "2025-04-06"))
//{
// Util.MsgE("4월 5일~6일은 데이터베이스 마이그레이션 기간이므로 프로그램 사용이 중단 됩니다\n문의 010-9155-9051 (EEDP:김치균)");
// return;

2
Project/EETGW.csproj
View File

@@ -763,7 +763,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets')" />
<PropertyGroup>
<PostBuildEvent>xcopy /E /I /Y "$(ProjectDir)frontend\dist\*" "$(TargetDir)Web\Dist\"</PostBuildEvent>
<PostBuildEvent>rem xcopy /E /I /Y "$(ProjectDir)frontend\dist\*" "$(TargetDir)Web\Dist\"</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>

4
Project/Pub.cs
View File

@@ -42,7 +42,7 @@ namespace Project
var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter();
var taQuery = new DSQueryTableAdapters.QueriesTableAdapter();
var nd = DateTime.Now.ToShortDateString();
var nd = DateTime.Now.ToString("yyyy-MM-dd");
//이 날짜가 휴일인지 체크한다.
var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
@@ -104,7 +104,7 @@ namespace Project
{
//자동로그인 업무일지 기록 기능 추가 = 210220
//select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
var nd = DateTime.Now.ToShortDateString();
var nd = DateTime.Now.ToString("yyyy-MM-dd");
var taQ = new DSQueryTableAdapters.QueriesTableAdapter();
var exist = taQ.ExistAutoInputData(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, nd) > 0;

4
Project/fMain.cs
View File

@@ -1035,7 +1035,7 @@ namespace Project
private void 개인별근태원장ToolStripMenuItem_Click(object sender, EventArgs e)
{
var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
var f = new FBS0000.fHolyDayData(DateTime.Now.ToShortDateString(), uid);
var f = new FBS0000.fHolyDayData(DateTime.Now.ToString("yyyy-MM-dd"), uid);
f.Show();
}
@@ -1357,7 +1357,7 @@ namespace Project
private void 개인별근태집계표ToolStripMenuItem_Click(object sender, EventArgs e)
{
var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
var f = new FBS0000.fHolyDayDataSum(DateTime.Now.ToShortDateString(), uid);
var f = new FBS0000.fHolyDayDataSum(DateTime.Now.ToString("yyyy-MM-dd"), uid);
f.Show();
}

6
Sub/Console_SendMail/_MailService.cs
View File

@@ -995,8 +995,8 @@ namespace Console_SendMail
//기준일자는 오늘부터 -15일이다
//var sd = DateTime.Now.AddDays(-15);
//var ed = DateTime.Now;
//var str_sd = sd.ToShortDateString();
//var str_ed = ed.ToShortDateString();
//var str_sd = sd.ToString("yyyy-MM-dd");
//var str_ed = ed.ToString("yyyy-MM-dd");
var str_dt = DateTime.Now.ToString("yyyy-MM-dd");
var sql = "select (select isnull(max(pdate),'') from ProjectsHistory where pidx = Projects.idx) as LastHistory," +
@@ -1182,7 +1182,7 @@ namespace Console_SendMail
newdr.tolist = "chikyun.kim@amkor.co.kr";
newdr.bcc = string.Empty;
newdr.cc = string.Empty;
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");//.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");//.ToString("yyyy-MM-dd");
newdr.body = ex.Message;
newdr.wuid = "dev";// "dev";
newdr.wdate = DateTime.Now;

2
Sub/tcpservice

Submodule Sub/tcpservice updated: d7fe2baa0e...1680e266da

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)

2
SubProject/FCM0000/.vs/FCM0000.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

4
SubProject/FCM0000/Customer_Import.cs
View File

@@ -106,8 +106,8 @@ namespace FCM0000
//제목줄을 처리한다. 181029
List<string> cols = new List<string>();
string sDate = sd.Value.ToShortDateString();
string eDate = ed.Value.ToShortDateString();
string sDate = sd.Value.ToString("yyyy-MM-dd");
string eDate = ed.Value.ToString("yyyy-MM-dd");
for (int c = MinCol; c <= MaxCol; c++)
{

2
SubProject/FCM0000/Inventory/RepInvStock.cs
View File

@@ -25,7 +25,7 @@ namespace FCM0000.Inventory
this.Show();
Application.DoEvents();
this.tbDate.Text = DateTime.Now.ToShortDateString();
this.tbDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
refreshData();

10
SubProject/FCM0000/Inventory/fInventory.cs
View File

@@ -112,8 +112,8 @@ namespace FCM0000
}
cmbUser.SelectedIndex = 0;//전체
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.AddYears(-1).ToShortDateString();
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
dtSD.Text = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
RefreshData();
}
@@ -159,7 +159,7 @@ namespace FCM0000
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["uid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["cr_qty"] = 0;
e.Row["cr_amt"] = 0;
e.Row["dr_qty"] = 0;
@@ -436,7 +436,7 @@ namespace FCM0000
}
var newdr = this.dSInventory.vInventory.NewvInventoryRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.invtype = "입고";
newdr.item = dr.item;
//newdr.ItemArray = dr.ItemArray;
@@ -473,7 +473,7 @@ namespace FCM0000
}
var newdr = this.dSInventory.vInventory.NewvInventoryRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.invtype = "출고";
newdr.item = dr.item;
//newdr.ItemArray = dr.ItemArray;

6
SubProject/FCM0000/Inventory/fInventoryJagoList.cs
View File

@@ -62,7 +62,7 @@ namespace FCM0000
updateplace();
dtSD.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.ToString("yyyy-MM-dd");
RefreshData();
}
@@ -233,7 +233,7 @@ namespace FCM0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.cr_qty = 0;
newdr.cr_amt = 0;
newdr.dr_qty = 0;
@@ -278,7 +278,7 @@ namespace FCM0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.cr_qty = 0;
newdr.cr_amt = 0;
newdr.dr_qty = 0;

2
SubProject/FCM0000/Inventory/fInventoryJagoPlace.cs
View File

@@ -70,7 +70,7 @@ namespace FCM0000.Inventory
FCOMMON.Util.MsgE("품목을 먼저 선택하세요");
return;
}
this.ta.FillByItemIdx(this.dSReport.jagosummaryPlace, FCOMMON.info.Login.gcode, DateTime.Now.ToShortDateString(), itmidx);
this.ta.FillByItemIdx(this.dSReport.jagosummaryPlace, FCOMMON.info.Login.gcode, DateTime.Now.ToString("yyyy-MM-dd"), itmidx);
}

6
SubProject/FCM0000/Inventory/fInventoryUser.cs
View File

@@ -75,10 +75,10 @@ namespace FCM0000
//마지막 자료를 가져온날을 찾는다.
var dateList = FCOMMON.DBM.getDateList("InventoryUser", "uid='" + FCOMMON.info.Login.no + "'");
dtED.Text = DateTime.Now.ToShortDateString();
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
if (dateList.Count > 0) dtSD.Text = dateList[dateList.Count - 1];
else dtSD.Text = DateTime.Now.AddDays(-7).ToShortDateString();
else dtSD.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
btSearch.PerformClick();
@@ -126,7 +126,7 @@ namespace FCM0000
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["uid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["dr_qty"] = 0;
e.Row["dr_amt"] = 0;
e.Row["invtype"] = "I1";

4
SubProject/FCM0000/Inventory/finventoryAdd.cs
View File

@@ -79,7 +79,7 @@ namespace FCM0000
///입력된 데이터를 적용한다.
if (dr.pdate == "") dr.pdate = DateTime.Now.ToShortDateString();
if (dr.pdate == "") dr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
dtPdate.Value = DateTime.Parse(dr.pdate);
dtPdate.Value = DateTime.Parse(dr.pdate);
// cmbRequest.Text = dr.userName;
@@ -265,7 +265,7 @@ namespace FCM0000
if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetitemNull();
else dr.item = int.Parse(tbPumIDX.Text);
dr.sid = tbSID.Text.Trim();
dr.pdate = this.dtPdate.Value.ToShortDateString();
dr.pdate = this.dtPdate.Value.ToString("yyyy-MM-dd");
dr.gcode = FCOMMON.info.Login.gcode;
if (cmbRequest.Text.IndexOf("]") != -1)
{

4
SubProject/FCM0000/Mail/fMailAutoAdd.cs
View File

@@ -152,8 +152,8 @@ namespace FCM0000
this.dr.fromlist = tbFrom.Text.Trim();
this.dr.enable = chkEnb.Checked;
this.dr.sdate = dtSd.Value.ToShortDateString();
this.dr.edate = dtEd.Value.ToShortDateString();
this.dr.sdate = dtSd.Value.ToString("yyyy-MM-dd");
this.dr.edate = dtEd.Value.ToString("yyyy-MM-dd");
this.dr.stime = string.Format("{0}:{1}",cmbHour.Text,cmbMinute.Text);
this.dr.tolist = tbTo.Text.Trim();
this.dr.bcc = tbBcc.Text.Trim();

2
SubProject/FCM0000/fHolidaytable.cs
View File

@@ -53,7 +53,7 @@ namespace FCM0000
var newdr = this.dsMSSQL.HolidayLIst.NewHolidayLIstRow();
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = dayvalue.ToShortDateString();// textBox1.Text.Trim() + "-" + i.ToString("00");
newdr.pdate = dayvalue.ToString("yyyy-MM-dd");// textBox1.Text.Trim() + "-" + i.ToString("00");
if (dayvalue.DayOfWeek == DayOfWeek.Saturday )
{
newdr.free = true;

4
SubProject/FCOMMON/DataBaseManager.cs
View File

@@ -37,7 +37,7 @@ namespace FCOMMON
var cmd = new System.Data.SqlClient.SqlCommand(sql1, cn);
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("date", SqlDbType.VarChar).Value = DateTime.Now.AddYears(-1).ToShortDateString();
cmd.Parameters.Add("date", SqlDbType.VarChar).Value = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
cnt1 = (int)cmd.ExecuteScalar();
cmd.CommandText = sql2;
cnt2 = (int)cmd.ExecuteScalar();
@@ -1155,7 +1155,7 @@ namespace FCOMMON
public static Boolean InsertLog(string cate, string remark, string pdate = "")
{
if (String.IsNullOrEmpty(pdate)) pdate = DateTime.Now.ToShortDateString();
if (String.IsNullOrEmpty(pdate)) pdate = DateTime.Now.ToString("yyyy-MM-dd");
try
{

2
SubProject/FCOMMON/Util_Form.cs
View File

@@ -103,7 +103,7 @@ namespace FCOMMON
if (DateTime.TryParse(src, out dt))
{
data = dt.ToShortDateString();
data = dt.ToString("yyyy-MM-dd");
return true;
}
else data = src;

2
SubProject/FED0000/License/fLicenseList.cs
View File

@@ -49,7 +49,7 @@ namespace FED0000
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["sdate"] = DateTime.Now.ToShortDateString();
e.Row["sdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;

6
SubProject/FEQ0000/Equipment/fImpEquipment.cs
View File

@@ -245,7 +245,7 @@ namespace FEQ0000
System.Text.StringBuilder sb = new StringBuilder();
sb.AppendLine("다음 자료를 추가하시겠습니까?");
sb.AppendLine();
sb.AppendLine("등록일 : " + dateTimePicker1.Value.ToShortDateString());
sb.AppendLine("등록일 : " + dateTimePicker1.Value.ToString("yyyy-MM-dd"));
sb.AppendLine();
sb.AppendLine("'저장 완료' 메세지가 나올때 까지 기다려 주세요.");
sb.AppendLine();
@@ -263,7 +263,7 @@ namespace FEQ0000
dt.Clear();
dt.AcceptChanges();
var dateStr = this.dateTimePicker1.Value.ToShortDateString();
var dateStr = this.dateTimePicker1.Value.ToString("yyyy-MM-dd");
this.progressBar1.Value = 0;
this.progressBar1.Maximum = dtExcel.Rows.Count;
@@ -349,7 +349,7 @@ namespace FEQ0000
//데이터추가
var newdr = dt.NewRow();
newdr["pdate"] = dateTimePicker1.Value.ToShortDateString();
newdr["pdate"] = dateTimePicker1.Value.ToString("yyyy-MM-dd");
newdr["asset"] = dr[6].ToString();
newdr["grp"] = dr[0].ToString();
newdr["type"] = dr[2].ToString();

2
SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs
View File

@@ -57,7 +57,7 @@ namespace FEQ0000
{
var dr = gItemGrp2.FirstOrDefault();
var newdr = dtSum.NewvEquStockAllRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.grp = dr.type;
newdr.manu = dr.manu;
newdr.model = dr.model;

30
SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
View File

@@ -54,7 +54,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -90,7 +90,7 @@ namespace FEQ0000
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["pumunit"] = "EA";
@@ -109,17 +109,17 @@ namespace FEQ0000
this.cmDate.SelectedIndex = 0;
this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
this.cmbSort.SelectedIndex = 0;
this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd");
this.dtED.Text = DateTime.Now.AddDays(10).ToString("yyyy-MM-dd");
var gcode = FCOMMON.info.Login.gcode;
var sdatestr = FCOMMON.DBM.ExecuteScalar($"select min(pdate) from EETGW_PurchaseCR with(nolock) where gcode='{gcode}' and [state] in ('---','PO','PR')");
if (DateTime.TryParse(sdatestr, out DateTime sdate))
dtSD.Text = sdate.ToShortDateString();
dtSD.Text = sdate.ToString("yyyy-MM-dd");
//var edatestr = FCOMMON.DBM.ExecuteScalar($"select max(pdate) from EETGW_PurchaseCR where gcode='{gcode}' and [state] in ('---','PO','PR')");
//if (DateTime.TryParse(edatestr, out DateTime edate))
// dtED.Text = edate.ToShortDateString();
// dtED.Text = edate.ToString("yyyy-MM-dd");
//state list
var stList = FCOMMON.DBM.getCodeList("04");
@@ -775,8 +775,8 @@ namespace FEQ0000
private void 내가등록한자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 0;
dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd");
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
cmbState.SelectedIndex = 0;
tbRequest.Text = FCOMMON.info.Login.nameK;
refreshData();
@@ -785,8 +785,8 @@ namespace FEQ0000
private void 금일입고품목ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 1; //입고일
dtSD.Text = DateTime.Now.ToShortDateString(); //당일
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.ToString("yyyy-MM-dd"); //당일
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -794,7 +794,7 @@ namespace FEQ0000
private void 이번달자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
dtED.Text = DateTime.Now.ToShortDateString();
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -967,7 +967,7 @@ namespace FEQ0000
bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
bcclist = ChangeMailAddress(bcclist);
var datestr = DateTime.Now.ToShortDateString();
var datestr = DateTime.Now.ToString("yyyy-MM-dd");
if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
else datestr = dtSD.Text + "~" + dtED.Text;
form_subject = form_subject.Replace("{DATE}", datestr);
@@ -1019,7 +1019,7 @@ namespace FEQ0000
var newdr = this.dsPurchase.EETGW_PurchaseCR.NewEETGW_PurchaseCRRow();
FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
newdr.orderno = string.Empty; //CR값 복사 안하게 210823
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.bigo = string.Empty;
@@ -1224,11 +1224,11 @@ namespace FEQ0000
var f = new FCOMMON.fSelectDay(dt);
if (f.ShowDialog() == DialogResult.OK)
{
tb.Text = f.dtPick.SelectionStart.ToShortDateString();
tb.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
var sd = DateTime.Parse(this.dtSD.Text);
var ed = DateTime.Parse(this.dtED.Text);
if (ed < sd) this.dtED.Text = sd.ToShortDateString();
if (ed < sd) this.dtED.Text = sd.ToString("yyyy-MM-dd");
}
}

6
SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs
View File

@@ -819,11 +819,11 @@ namespace FEQ0000
else dr.pumidx = int.Parse(tbPumIDX.Text);
dr.sid = tbSID.Text.Trim();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToShortDateString();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToString("yyyy-MM-dd");
else dr.SetedateNull();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToShortDateString();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToString("yyyy-MM-dd");
else dr.SetindateNull();
dr.pdate = this.dtPdate.Value.ToShortDateString();
dr.pdate = this.dtPdate.Value.ToString("yyyy-MM-dd");
dr.gcode = FCOMMON.info.Login.gcode;
if (cmbRequest.Text.IndexOf("]") != -1)

2
SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs
View File

@@ -62,7 +62,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;

2
SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs
View File

@@ -160,7 +160,7 @@ namespace FEQ0000.Purchase
}
}
dr.indate = dtInDate.Value.ToShortDateString();
dr.indate = dtInDate.Value.ToString("yyyy-MM-dd");
dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
// dr.receiveName = cmbReceive.Text.Substring(cmbReceive.Text.IndexOf("]") + 1).Trim();
if (int.TryParse(tbInQty.Text, out int qty) == false)

26
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs
View File

@@ -57,7 +57,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -93,7 +93,7 @@ namespace FEQ0000
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["pumunit"] = "EA";
@@ -113,8 +113,8 @@ namespace FEQ0000
this.cmDate.SelectedIndex = 0;
this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
this.cmbSort.SelectedIndex = 0;
this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd");
this.dtED.Text = DateTime.Now.AddDays(10).ToString("yyyy-MM-dd");
//state list
var stList = FCOMMON.DBM.getCodeList("04");
@@ -730,8 +730,8 @@ namespace FEQ0000
private void 내가등록한자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 0;
dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd");
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
cmbState.SelectedIndex = 0;
tbRequest.Text = FCOMMON.info.Login.nameK;
refreshData();
@@ -740,8 +740,8 @@ namespace FEQ0000
private void 금일입고품목ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 1; //입고일
dtSD.Text = DateTime.Now.ToShortDateString(); //당일
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.ToString("yyyy-MM-dd"); //당일
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -749,7 +749,7 @@ namespace FEQ0000
private void 이번달자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
dtED.Text = DateTime.Now.ToShortDateString();
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -775,7 +775,7 @@ namespace FEQ0000
var newdr = this.dsPurchase.EETGW_PurchaseEB.NewEETGW_PurchaseEBRow();
FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
newdr.orderno = string.Empty; //CR값 복사 안하게 210823
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.state = "---";
@@ -994,11 +994,11 @@ namespace FEQ0000
var f = new FCOMMON.fSelectDay(dt);
if (f.ShowDialog() == DialogResult.OK)
{
tb.Text = f.dtPick.SelectionStart.ToShortDateString();
tb.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
var sd = DateTime.Parse(this.dtSD.Text);
var ed = DateTime.Parse(this.dtED.Text);
if (ed < sd) this.dtED.Text = sd.ToShortDateString();
if (ed < sd) this.dtED.Text = sd.ToString("yyyy-MM-dd");
}
}
@@ -1352,7 +1352,7 @@ namespace FEQ0000
bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
bcclist = ChangeMailAddress(bcclist);
var datestr = DateTime.Now.ToShortDateString();
var datestr = DateTime.Now.ToString("yyyy-MM-dd");
if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
else datestr = dtSD.Text + "~" + dtED.Text;
form_subject = form_subject.Replace("{DATE}", datestr);

6
SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs
View File

@@ -625,11 +625,11 @@ namespace FEQ0000
else dr.pumidx = int.Parse(tbPumIDX.Text);
dr.sid = tbSID.Text.Trim();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToShortDateString();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToString("yyyy-MM-dd");
else dr.SetedateNull();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToShortDateString();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToString("yyyy-MM-dd");
else dr.SetindateNull();
dr.pdate = this.dtPdate.Value.ToShortDateString();
dr.pdate = this.dtPdate.Value.ToString("yyyy-MM-dd");
dr.gcode = FCOMMON.info.Login.gcode;
if (cmbRequest.Text.IndexOf("]") != -1)

2
SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs
View File

@@ -55,7 +55,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;

2
SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Ipgo.cs
View File

@@ -137,7 +137,7 @@ namespace FEQ0000.Purchase
}
else
{
dr.indate = dtInDate.Value.ToShortDateString();
dr.indate = dtInDate.Value.ToString("yyyy-MM-dd");
dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
// dr.receiveName = cmbReceive.Text.Substring(cmbReceive.Text.IndexOf("]") + 1).Trim();
if (int.TryParse(tbInQty.Text, out int qty) == false)

26
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs
View File

@@ -62,7 +62,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -98,7 +98,7 @@ namespace FEQ0000
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["pumunit"] = "EA";
@@ -118,8 +118,8 @@ namespace FEQ0000
this.cmDate.SelectedIndex = 0;
this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
this.cmbSort.SelectedIndex = 0;
this.dtSD.Text = DateTime.Now.AddDays(-90).ToShortDateString();
this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddDays(-90).ToString("yyyy-MM-dd");
this.dtED.Text = DateTime.Now.AddDays(10).ToString("yyyy-MM-dd");
//state list
@@ -813,8 +813,8 @@ namespace FEQ0000
private void 내가등록한자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 0;
dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd");
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
cmbState.SelectedIndex = 0;
tbRequest.Text = FCOMMON.info.Login.nameK;
refreshData();
@@ -823,8 +823,8 @@ namespace FEQ0000
private void 금일입고품목ToolStripMenuItem_Click(object sender, EventArgs e)
{
cmDate.SelectedIndex = 1; //입고일
dtSD.Text = DateTime.Now.ToShortDateString(); //당일
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.ToString("yyyy-MM-dd"); //당일
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -832,7 +832,7 @@ namespace FEQ0000
private void 이번달자료ToolStripMenuItem_Click(object sender, EventArgs e)
{
dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01";
dtED.Text = DateTime.Now.ToShortDateString();
dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");
tbRequest.Text = string.Empty;
refreshData();
}
@@ -860,7 +860,7 @@ namespace FEQ0000
var newdr = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
newdr.orderno = string.Empty; //CR값 복사 안하게 210823
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.state = "---";
@@ -1094,11 +1094,11 @@ namespace FEQ0000
var f = new FCOMMON.fSelectDay(dt);
if (f.ShowDialog() == DialogResult.OK)
{
tb.Text = f.dtPick.SelectionStart.ToShortDateString();
tb.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
var sd = DateTime.Parse(this.dtSD.Text);
var ed = DateTime.Parse(this.dtED.Text);
if (ed < sd) this.dtED.Text = sd.ToShortDateString();
if (ed < sd) this.dtED.Text = sd.ToString("yyyy-MM-dd");
}
}
@@ -1497,7 +1497,7 @@ namespace FEQ0000
bcclist.AddRange(form_bcc.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries));
bcclist = ChangeMailAddress(bcclist);
var datestr = DateTime.Now.ToShortDateString();
var datestr = DateTime.Now.ToString("yyyy-MM-dd");
if (dtSD.Text == dtED.Text) datestr = dtSD.Text;
else datestr = dtSD.Text + "~" + dtED.Text;
form_subject = form_subject.Replace("{DATE}", datestr);

2
SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs
View File

@@ -61,7 +61,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;

2
SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs
View File

@@ -146,7 +146,7 @@ namespace FEQ0000.Purchase
}
else
{
dr.indate = dtInDate.Value.ToShortDateString();
dr.indate = dtInDate.Value.ToString("yyyy-MM-dd");
dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
// dr.receiveName = cmbReceive.Text.Substring(cmbReceive.Text.IndexOf("]") + 1).Trim();
if (int.TryParse(tbInQty.Text, out int qty) == false)

8
SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
View File

@@ -906,14 +906,14 @@ namespace FEQ0000
else dr.pumidx = int.Parse(tbPumIDX.Text);
dr.sid = tbSID.Text.Trim();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToShortDateString();
if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToString("yyyy-MM-dd");
else dr.SetedateNull();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToShortDateString();
if (chkInDate.Checked) dr.indate = this.dtInDate.Value.ToString("yyyy-MM-dd");
else dr.SetindateNull();
if (chkprdate.Checked) dr.prdate = this.dtPrdate.Value.ToShortDateString();
if (chkprdate.Checked) dr.prdate = this.dtPrdate.Value.ToString("yyyy-MM-dd");
else dr.SetprdateNull();
dr.pdate = this.dtPdate.Value.ToShortDateString();
dr.pdate = this.dtPdate.Value.ToString("yyyy-MM-dd");
dr.gcode = FCOMMON.info.Login.gcode;
if (cmbRequest.Text.IndexOf("]") != -1)

2
SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs
View File

@@ -383,7 +383,7 @@ namespace FEQ0000
else dr.pumidx = int.Parse(tbPumIDX.Text);
dr.sid = tbSID.Text.Trim();
dr.pdate = this.dtPdate.Value.ToShortDateString();
dr.pdate = this.dtPdate.Value.ToString("yyyy-MM-dd");
dr.place = cmbPlace.Text;
dr.gcode = FCOMMON.info.Login.gcode;

8
SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs
View File

@@ -107,8 +107,8 @@ namespace FEQ0000
//제목줄을 처리한다. 181029
List<string> cols = new List<string>();
string sDate = sd.Value.ToShortDateString();
string eDate = ed.Value.ToShortDateString();
string sDate = sd.Value.ToString("yyyy-MM-dd");
string eDate = ed.Value.ToString("yyyy-MM-dd");
for (int c = MinCol; c <= MaxCol; c++)
{
@@ -295,8 +295,8 @@ namespace FEQ0000
var taE = new dsPurchaseTableAdapters.PurchaseTableAdapter();
if (checkBox1.Checked) taE.DeleteImport(
sd.Value.ToShortDateString(),
ed.Value.ToShortDateString(),
sd.Value.ToString("yyyy-MM-dd"),
ed.Value.ToString("yyyy-MM-dd"),
FCOMMON.info.Login.no,
FCOMMON.info.Login.gcode);
taE.Update((dsPurchase.PurchaseDataTable)dt);

8
SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs
View File

@@ -106,8 +106,8 @@ namespace FEQ0000
//제목줄을 처리한다. 181029
List<string> cols = new List<string>();
//string sDate = sd.Value.ToShortDateString();
//string eDate = ed.Value.ToShortDateString();
//string sDate = sd.Value.ToString("yyyy-MM-dd");
//string eDate = ed.Value.ToString("yyyy-MM-dd");
for (int c = MinCol; c <= MaxCol; c++)
{
@@ -307,8 +307,8 @@ namespace FEQ0000
//과거데이터 삭제
if (checkBox1.Checked) taE.DeleteImport(
dtPdate.Value.ToShortDateString(),
dtPdate.Value.ToShortDateString(),
dtPdate.Value.ToString("yyyy-MM-dd"),
dtPdate.Value.ToString("yyyy-MM-dd"),
FCOMMON.info.Login.no, FCOMMON.info.Login.gcode);
taE.Update((dsPurchase.PurchaseDataTable)dt);

12
SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs
View File

@@ -224,13 +224,13 @@ namespace FEQ0000
if (valid == false) return;
////기존자료확인
//var cnt = ta.CoutImport(dtPdate.Value.ToShortDateString(), dtPdate.Value.ToShortDateString(),
//var cnt = ta.CoutImport(dtPdate.Value.ToString("yyyy-MM-dd"), dtPdate.Value.ToString("yyyy-MM-dd"),
// FCOMMON.info.Login.no, FCOMMON.info.Login.gcode);
//if (cnt > 0)
//{
// var dlg = FCOMMON.Util.MsgQ("기존에 등록된 자료가 " + cnt.ToString() + "건 있습니다. 이 자료를 삭제할까요?");
// if (dlg == DialogResult.Yes)
// ta.DeleteImport(dtPdate.Value.ToShortDateString(), dtPdate.Value.ToShortDateString(),
// ta.DeleteImport(dtPdate.Value.ToString("yyyy-MM-dd"), dtPdate.Value.ToString("yyyy-MM-dd"),
// FCOMMON.info.Login.no, FCOMMON.info.Login.gcode);
//}
@@ -265,7 +265,7 @@ namespace FEQ0000
dr.manuproc = cbManuProc.Text;
dr.process = cbProcess.Text.Trim();
dr.state = cmbState.Text.Trim();
// dr.pdate = dtPdate.Value.ToShortDateString();
// dr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
dr.project = tbProject.Text.Trim();
dr.AcceptChanges();
dr.SetAdded();
@@ -286,7 +286,7 @@ namespace FEQ0000
dr.manuproc = cbManuProc.Text;
dr.process = cbProcess.Text.Trim();
dr.state = cmbState.Text.Trim();
// dr.pdate = dtPdate.Value.ToShortDateString();
// dr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
dr.project = tbProject.Text.Trim();
dr.AcceptChanges();
dr.SetAdded();
@@ -310,7 +310,7 @@ namespace FEQ0000
//dr.manuproc = cbManuProc.Text;
dr.process = cbProcess.Text.Trim();
dr.state = cmbState.Text.Trim();
// dr.pdate = dtPdate.Value.ToShortDateString();
// dr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
dr.project = tbProject.Text.Trim();
dr.AcceptChanges();
dr.SetAdded();
@@ -570,7 +570,7 @@ namespace FEQ0000
}
else
{
입고일 = indatevalue.ToShortDateString();
입고일 = indatevalue.ToString("yyyy-MM-dd");
}
}
else if (cf_입고일 == libxl.CellType.CELLTYPE_NUMBER)

6
SubProject/FEQ0000/fItemin.cs
View File

@@ -52,7 +52,7 @@ namespace FEQ0000
var dt = DateTime.Now.AddYears(-2);
this.ta.Fill(this.dsPurchase.Ipkolist,
dt.ToShortDateString(),
dt.ToString("yyyy-MM-dd"),
FCOMMON.info.Login.gcode,
search_mananger, search_admin);
@@ -208,7 +208,7 @@ namespace FEQ0000
}
tbindate.Text = DateTime.Now.ToShortDateString();
tbindate.Text = DateTime.Now.ToString("yyyy-MM-dd");
refreshData();
}
@@ -346,7 +346,7 @@ namespace FEQ0000
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.tabControl1.SelectedIndex == 1)
tbindate.Text = DateTime.Now.ToShortDateString();
tbindate.Text = DateTime.Now.ToString("yyyy-MM-dd");
}
private void btRefreshIn_Click(object sender, EventArgs e)

4
SubProject/FEQ0000/fPurchaseConfirm.cs
View File

@@ -66,7 +66,7 @@ namespace FEQ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -540,7 +540,7 @@ namespace FEQ0000
var newdr = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
newdr.orderno = string.Empty; //CR값 복사 안하게 210823
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.state = "---";

2
SubProject/FPJ0000/.vs/FPJ0000.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

10
SubProject/FPJ0000/JobReport_/K5Dailyform.cs
View File

@@ -106,8 +106,8 @@ namespace FPJ0000.JobReport_
// //this.fpSpread1.Sheets[0].Cells[3, 6].Value = dte.Value;
// ////근문일수,시간
// var vSD = dts.Value.ToShortDateString();
// var vED = dte.Value.ToShortDateString();
// var vSD = dts.Value.ToString("yyyy-MM-dd");
// var vED = dte.Value.ToString("yyyy-MM-dd");
// ////휴가일수확인
// //var drDays = db.HolidayLIst.Where(t => t.free == false && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0);
@@ -271,8 +271,8 @@ namespace FPJ0000.JobReport_
//자료를 불러온다
var sd = dts.Value.ToShortDateString();// DateTime.Parse(dtSD.Text).ToShortDateString();
var ed = dte.Value.ToShortDateString(); // DateTime.Parse(dtED.Text).ToShortDateString();
var sd = dts.Value.ToString("yyyy-MM-dd");// DateTime.Parse(dtSD.Text).ToString("yyyy-MM-dd");
var ed = dte.Value.ToString("yyyy-MM-dd"); // DateTime.Parse(dtED.Text).ToString("yyyy-MM-dd");
var db = new dsJobReportTableAdapters.vJobReportForUserTableAdapter();// EEEntities();
var gcode = "EET1P";
@@ -282,7 +282,7 @@ namespace FPJ0000.JobReport_
var rawdata = db.GetByDate(FCOMMON.info.Login.gcode, sd, ed).OrderBy(t => t.pdate).GroupBy(t => t.pdate);// ..vJobReportForUser.AsNoTracking()
//.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1)
//.OrderBy(t => t.pdate).GroupBy(t => t.pdate).ToList();
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToString("yyyy-MM-dd"), ed.ToShortTimeString());
var col = 3;

4
SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
View File

@@ -138,8 +138,8 @@ namespace FPJ0000.JobReport_
this.fpSpread1.Sheets[0].Cells[3, 5].Value = dte.Value;
//근문일수,시간
var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString();
var vSD = dts.Value.ToString("yyyy-MM-dd");
var vED = dte.Value.ToString("yyyy-MM-dd");
//휴가일수확인
var taHolidylist = new dsJobReportTableAdapters.HolidayLIstTableAdapter();

30
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -95,7 +95,7 @@ namespace FPJ0000
EnsureVisibleAndUsableSize();
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
//공정목록
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
@@ -219,7 +219,7 @@ namespace FPJ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -411,7 +411,7 @@ namespace FPJ0000
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["status"] = "진행 완료";//other
@@ -481,7 +481,7 @@ namespace FPJ0000
{
var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
newdr.status = "진행 완료";
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday ||
DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0;
@@ -615,7 +615,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
//newdr.description = "";
newdr.pdate = DateTime.Now.ToShortDateString(); //190509
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); //190509
newdr.idx = -1;
//newdr.hrs = 8.0;
newdr.SethrsNull();
@@ -690,11 +690,11 @@ namespace FPJ0000
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
else
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
refreshData();
}
@@ -762,7 +762,7 @@ namespace FPJ0000
{
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 toolStripButton4_Click(object sender, EventArgs e)
@@ -825,8 +825,8 @@ namespace FPJ0000
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");
}
@@ -835,8 +835,8 @@ namespace FPJ0000
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 toolStripButton10_Click(object sender, EventArgs e)
@@ -933,7 +933,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
newdr.pdate = d.ToShortDateString(); //190509
newdr.pdate = d.ToString("yyyy-MM-dd"); //190509
newdr.idx = -1;
newdr.hrs = 8.0;
newdr.ot = 0.0;

12
SubProject/FPJ0000/JobReport_/fJobReportAI.cs
View File

@@ -117,7 +117,7 @@ namespace FPJ0000
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["status"] = "진행 완료";//other
@@ -177,7 +177,7 @@ namespace FPJ0000
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
{
var newdr = this.dsMSSQL.EETGW_JobReport_AutoInput.NewEETGW_JobReport_AutoInputRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.uid = FCOMMON.info.Login.no;
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wdate = DateTime.Now;
@@ -299,7 +299,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
//newdr.description = "";
newdr.pdate = DateTime.Now.ToShortDateString(); //190509
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); //190509
newdr.idx = -1;
newdr.hrs = 8.0;
newdr.ot = 0.0;
@@ -386,7 +386,7 @@ namespace FPJ0000
{
if (sd > DateTime.Now) break;
//이날짜가 일반 날짜라면 데이터를 기록한다.
var dayinfo = db.GetOne(sd.ToShortDateString()).FirstOrDefault();// holilist.Where(t => t.pdate == sd.ToShortDateString()).FirstOrDefault();
var dayinfo = db.GetOne(sd.ToString("yyyy-MM-dd")).FirstOrDefault();// holilist.Where(t => t.pdate == sd.ToString("yyyy-MM-dd")).FirstOrDefault();
if (dayinfo.free == true)
{
sd = sd.AddDays(1);
@@ -394,7 +394,7 @@ namespace FPJ0000
}
//그냥 생성된자료가 없어야한다
var vPdate = sd.ToShortDateString();
var vPdate = sd.ToString("yyyy-MM-dd");
if (taJobReportQuery.ExistUserData(FCOMMON.info.Login.gcode, vPdate, dr.uid) > 0)// db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == vPdate && t.uid == dr.uid).Any())
{
sd = sd.AddDays(1);
@@ -406,7 +406,7 @@ namespace FPJ0000
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = sd.ToShortDateString();
newdr.pdate = sd.ToString("yyyy-MM-dd");
newdr.import = false;
newdr.hrs = dr.hrs;
newdr.ot = dr.ot;

8
SubProject/FPJ0000/JobReport_/fJobReportImport.cs
View File

@@ -140,7 +140,7 @@ namespace FPJ0000.JobReport_
var dayval = sheet.readNum(r, colidx);
var daystr = string.Format("{0}-{1}-{2}", DateTime.Now.Year, monstr, dayval);
var dt = DateTime.Parse(daystr);
dr.pdate = dt.ToShortDateString();
dr.pdate = dt.ToString("yyyy-MM-dd");
}
else if (nuddate.Value > 0)
{
@@ -333,20 +333,20 @@ namespace FPJ0000.JobReport_
var sd = dateTimePicker2.Value;
var ed = dateTimePicker1.Value;
var dlg = FCOMMON.Util.MsgQ($"{sd.ToShortDateString()}~{ed.ToShortDateString()} 사이의 업로드된 자료를 삭제 할까요?");
var dlg = FCOMMON.Util.MsgQ($"{sd.ToString("yyyy-MM-dd")}~{ed.ToString("yyyy-MM-dd")} 사이의 업로드된 자료를 삭제 할까요?");
if (dlg != DialogResult.Yes) return;
var ta = new dsPRJTableAdapters.JobReportTableAdapter();
if (this.cmbUser.SelectedValue == null || this.cmbUser.SelectedValue.ToString() == "--")
{
var cnt = ta.DeleteImportAll(sd.ToShortDateString(), ed.ToShortDateString(), FCOMMON.info.Login.gcode);
var cnt = ta.DeleteImportAll(sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"), FCOMMON.info.Login.gcode);
FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다");
}
else
{
var uid = this.cmbUser.SelectedItem.ToString();
var cnt = ta.DeleteImport(sd.ToShortDateString(), ed.ToShortDateString(), uid, FCOMMON.info.Login.gcode);
var cnt = ta.DeleteImport(sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"), uid, FCOMMON.info.Login.gcode);
FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다");
}

18
SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
View File

@@ -507,7 +507,7 @@ namespace FPJ0000.JobReport_
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString());
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToString("yyyy-MM-dd"));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtPdate.Value = f.dtSelect;
}
@@ -596,7 +596,7 @@ namespace FPJ0000.JobReport_
///휴일체크
var taQ = new dsQueryTableAdapters.QueriesTableAdapter();
var freeday = taQ.CheckHoliday(dtPdate.Value.ToShortDateString());
var freeday = taQ.CheckHoliday(dtPdate.Value.ToString("yyyy-MM-dd"));
if (freeday != null && freeday == true)
{
var hrs = float.Parse(tbHrs.Text);
@@ -623,7 +623,7 @@ namespace FPJ0000.JobReport_
else
{
//190906
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf);
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToString("yyyy-MM-dd"), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf);
}
}
@@ -688,7 +688,7 @@ namespace FPJ0000.JobReport_
//}
this.dr.uid = this.cmbUser.SelectedValue.ToString();
this.dr.pdate = dtPdate.Value.ToShortDateString();
this.dr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
this.dr.status = cmbState.Text;
this.dr.projectName = tbProject.Text;
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
@@ -752,7 +752,7 @@ namespace FPJ0000.JobReport_
mbody.gcode = FCOMMON.info.Login.gcode;
mbody.cate = mf.cate;
mbody.fromlist = "gw@amkor.co.kr";
mbody.pdate = DateTime.Now.ToShortDateString();
mbody.pdate = DateTime.Now.ToString("yyyy-MM-dd");
mbody.subject = maildataupdate(mf.subject);
mbody.body = maildataupdate(mf.body);
mbody.wuid = FCOMMON.info.Login.no;
@@ -778,10 +778,10 @@ namespace FPJ0000.JobReport_
if (string.IsNullOrEmpty(org)) return string.Empty;
org = org.Replace("{pname}", tbProject.Text);
org = org.Replace("{pidx}", tbProjectIndex.Text);
org = org.Replace("{sdate}", dtPdate.Value.ToShortDateString());
org = org.Replace("{edate}", dtPdate.Value.ToShortDateString());
org = org.Replace("{pdate}", dtPdate.Value.ToShortDateString());
org = org.Replace("{DATE}", dtPdate.Value.ToShortDateString());
org = org.Replace("{sdate}", dtPdate.Value.ToString("yyyy-MM-dd"));
org = org.Replace("{edate}", dtPdate.Value.ToString("yyyy-MM-dd"));
org = org.Replace("{pdate}", dtPdate.Value.ToString("yyyy-MM-dd"));
org = org.Replace("{DATE}", dtPdate.Value.ToString("yyyy-MM-dd"));
org = org.Replace("{NAME}", cmbUser.Text);
org = org.Replace("{HR}", tbHrs.Text);
org = org.Replace("{OT}", tbOt.Text);

6
SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs
View File

@@ -273,7 +273,7 @@ namespace FPJ0000.JobReport_
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dts.Value.ToShortDateString());
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dts.Value.ToString("yyyy-MM-dd"));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dts.Value = f.dtSelect;
}
@@ -329,7 +329,7 @@ namespace FPJ0000.JobReport_
dr.enable = chkEnable.Checked;
this.dr.uid = this.cmbUser.SelectedValue.ToString();
this.dr.pdate = dts.Value.ToShortDateString();
this.dr.pdate = dts.Value.ToString("yyyy-MM-dd");
this.dr.status = cmbGrp26.Text;
this.dr.projectName = tbProject.Text;
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
@@ -344,7 +344,7 @@ namespace FPJ0000.JobReport_
this.dr.SetotNull();
//완료일자 적용 - 210803 chi <= 김윤선p
if (checkBox1.Checked) dr.edate = dte.Value.ToShortDateString();
if (checkBox1.Checked) dr.edate = dte.Value.ToString("yyyy-MM-dd");
else dr.SetedateNull();
//MessageBox.Show(richTextBox1.Text);

8
SubProject/FPJ0000/JobReport_/fProjectConnect.cs
View File

@@ -29,8 +29,8 @@ namespace FPJ0000.JobReport_
void RefreshList()
{
var cn = FCOMMON.DBM.getCn();
var sd = dts.Value.ToShortDateString();
var ed = dte.Value.ToShortDateString();
var sd = dts.Value.ToString("yyyy-MM-dd");
var ed = dte.Value.ToString("yyyy-MM-dd");
var sql =
$"select projectName,max(pidx) as pidx " +
$" from JobReport" +
@@ -135,8 +135,8 @@ namespace FPJ0000.JobReport_
var cn = FCOMMON.DBM.getCn();
var sd = dts.Value.ToShortDateString();
var ed = dte.Value.ToShortDateString();
var sd = dts.Value.ToString("yyyy-MM-dd");
var ed = dte.Value.ToString("yyyy-MM-dd");
if (cn.State == ConnectionState.Closed) cn.Open();
var cmd = new System.Data.SqlClient.SqlCommand("", cn);

4
SubProject/FPJ0000/JobReport_/rJobReportPrj.cs
View File

@@ -88,8 +88,8 @@ namespace FPJ0000.JobReport_
{
//근문일수,시간
var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString();
var vSD = dts.Value.ToString("yyyy-MM-dd");
var vED = dte.Value.ToString("yyyy-MM-dd");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
var taH = new dsReportTableAdapters.JobProjectTimesTableAdapter();

4
SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs
View File

@@ -100,8 +100,8 @@ namespace FPJ0000.JobReport_
{
//근문일수,시간
// var vSD = dts.Value.ToShortDateString();
//var vED = dte.Value.ToShortDateString();
// var vSD = dts.Value.ToString("yyyy-MM-dd");
//var vED = dte.Value.ToString("yyyy-MM-dd");
var curww = int.Parse(DateTime.Now.ToString("yy") + "00") + int.Parse(tbWW.Tag.ToString());
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();

4
SubProject/FPJ0000/JobReport_/rJobReportType.cs
View File

@@ -92,8 +92,8 @@ namespace FPJ0000.JobReport_
{
//근문일수,시간
var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString();
var vSD = dts.Value.ToString("yyyy-MM-dd");
var vED = dte.Value.ToString("yyyy-MM-dd");
//string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
var taH = new dsReportTableAdapters.vJobReportForUserTableAdapter();

4
SubProject/FPJ0000/JobReport_/rJobReportUser.cs
View File

@@ -129,8 +129,8 @@ namespace FPJ0000.JobReport_
fpSpread1.Sheets[0].AddSpanCell(5, 11, 2, 1);
//근문일수,시간
var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString();
var vSD = dts.Value.ToString("yyyy-MM-dd");
var vED = dte.Value.ToString("yyyy-MM-dd");
//휴가일수확인
var drDays = taHolydayDateList.GetData(vSD, vED);

16
SubProject/FPJ0000/JobReport_/rK5Dailyform.cs
View File

@@ -49,8 +49,8 @@ namespace FPJ0000.JobReport_
//자료를 불러온다
var sd = DateTime.Parse(dtSD.Text).ToShortDateString();
var ed = DateTime.Parse(dtED.Text).ToShortDateString();
var sd = DateTime.Parse(dtSD.Text).ToString("yyyy-MM-dd");
var ed = DateTime.Parse(dtED.Text).ToString("yyyy-MM-dd");
var db = new dsReportTableAdapters.vJobReportForUserTableAdapter();// EEEntities();
var gcode = "EET1P";
@@ -62,7 +62,7 @@ namespace FPJ0000.JobReport_
var rawdata = db.GetByDate(FCOMMON.info.Login.gcode, sd, ed).GroupBy(t => t.pdate);//.vJobReportForUser.AsNoTracking()
//.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0)
//.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToString("yyyy-MM-dd"), ed.ToShortTimeString());
// var rawdata = rawdata0.GroupBy(t => t.pdate);
@@ -387,18 +387,18 @@ namespace FPJ0000.JobReport_
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
else
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
}
private void toolStripLabel4_Click(object sender, EventArgs e)
{
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 chkallto_Click(object sender, EventArgs e)

28
SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
View File

@@ -51,8 +51,8 @@ namespace FPJ0000
{
EnsureVisibleAndUsableSize();
this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
this.dtED.Text = DateTime.Now.AddMonths(1).ToString("yyyy-MM-dd");// sdate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd");
this.dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
UpdateUserList();
@@ -132,7 +132,7 @@ namespace FPJ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -270,11 +270,11 @@ namespace FPJ0000
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
else
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
refreshData();
}
@@ -293,7 +293,7 @@ namespace FPJ0000
{
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 arDatagridView1_DataError(object sender, DataGridViewDataErrorEventArgs e)
@@ -304,8 +304,8 @@ namespace FPJ0000
private void btAdd_Click(object sender, EventArgs e)
{
var newdr = this.dSKuntae.EETGW_HolydayRequest.NewEETGW_HolydayRequestRow();
newdr.sdate = DateTime.Now.ToShortDateString();
newdr.edate = DateTime.Now.ToShortDateString();
newdr.sdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.edate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.HolyDays = 0;
newdr.HolyTimes = 0f;
newdr.cate = "년차";
@@ -422,8 +422,8 @@ namespace FPJ0000
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");
}
@@ -432,8 +432,8 @@ namespace FPJ0000
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 toolStripButton1_Click(object sender, EventArgs e)

30
SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
View File

@@ -196,7 +196,7 @@ namespace FPJ0000.OtConfirm
return;
}
if (tbED.Value.ToShortDateString().CompareTo(tbSD.Value.ToShortDateString()) < 0)
if (tbED.Value.ToString("yyyy-MM-dd").CompareTo(tbSD.Value.ToString("yyyy-MM-dd")) < 0)
{
FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요");
return;
@@ -269,7 +269,7 @@ namespace FPJ0000.OtConfirm
//}
//
if (tbSD.Value.ToShortDateString().Equals(tbED.Value.ToShortDateString()) == false)
if (tbSD.Value.ToString("yyyy-MM-dd").Equals(tbED.Value.ToString("yyyy-MM-dd")) == false)
{
FCOMMON.Util.MsgE("외출은 시작일 종료일이 같아야 합니다, 종료일자를 시작일자로 자동 변경 합니다");
tbED.Value = tbSD.Value;
@@ -278,8 +278,8 @@ namespace FPJ0000.OtConfirm
if (textBox2.Text.Equals("00:00") == false)
{
var st = DateTime.Parse(tbSD.Value.ToShortDateString() + " " + textBox1.Text + ":00");
var et = DateTime.Parse(tbED.Value.ToShortDateString() + " " + textBox2.Text + ":00");
var st = DateTime.Parse(tbSD.Value.ToString("yyyy-MM-dd") + " " + textBox1.Text + ":00");
var et = DateTime.Parse(tbED.Value.ToString("yyyy-MM-dd") + " " + textBox2.Text + ":00");
if (et <= st)
{
FCOMMON.Util.MsgE("외출 시간을 확인하세요.\n종료시간은 시작시간보다 커야 합니다");
@@ -361,7 +361,7 @@ namespace FPJ0000.OtConfirm
{
var db = new dsPRJTableAdapters.QueriesTableAdapter();
string chkdt = tbSD.Value.ToShortDateString();
string chkdt = tbSD.Value.ToString("yyyy-MM-dd");
var existdb = db.ExistHolydayRequest(FCOMMON.info.Login.gcode, cate, uid.ToString(), chkdt) > 0;// db.EETGW_HolydayRequest.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == cate && t.uid == uid.ToString() && t.sdate == chkdt).Any();
if (existdb)
{
@@ -413,8 +413,8 @@ namespace FPJ0000.OtConfirm
dr.Response = tbResponse.Text.Trim();
dr.sdate = tbSD.Value.ToShortDateString();
dr.edate = tbED.Value.ToShortDateString();
dr.sdate = tbSD.Value.ToString("yyyy-MM-dd");
dr.edate = tbED.Value.ToString("yyyy-MM-dd");
dr.sendmail = chkSendMail.Checked; //220104
if (textBox1.Text.isEmpty() == false && textBox1.Text.Equals("00:00") == false)
@@ -461,10 +461,10 @@ namespace FPJ0000.OtConfirm
void UpdateStatus()
{
//해당 값이 오늘보다 이전이라면 메일전송을 자동 해제하낟.
var v = tbED.Value.ToShortDateString();
var s = tbSD.Value.ToShortDateString();
var v = tbED.Value.ToString("yyyy-MM-dd");
var s = tbSD.Value.ToString("yyyy-MM-dd");
var c = DateTime.Now.ToShortDateString();
var c = DateTime.Now.ToString("yyyy-MM-dd");
if (v.CompareTo(c) < 0)
chkSendMail.Checked = false;
else
@@ -613,11 +613,11 @@ namespace FPJ0000.OtConfirm
private void tbSD_ValueChanged(object sender, EventArgs e)
{
UpdateMessage();
if(tbED.Value < tbSD.Value)
{
FCOMMON.Util.MsgE("종료일자를 시작일자로 변경합니다");
tbED.Value = tbSD.Value;
}
//if(tbED.Value < tbSD.Value)
//{
// FCOMMON.Util.MsgE("종료일자를 시작일자로 변경합니다");
// tbED.Value = tbSD.Value;
//}
}
}
}

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

@@ -39,8 +39,8 @@ namespace FPJ0000
EnsureVisibleAndUsableSize();
//this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
//var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
this.dtED.Text = DateTime.Now.ToString("yyyy-MM-dd");// sdate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd");
//공정목록
// var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
@@ -213,7 +213,7 @@ namespace FPJ0000
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
if (input == "") tb.Text = DateTime.Now.ToString("yyyy-MM-dd");
else
{
string dt = string.Empty;
@@ -362,11 +362,11 @@ namespace FPJ0000
var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text));
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
dtSD.Text = sdDate.ToShortDateString();
if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString())
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
dtSD.Text = sdDate.ToString("yyyy-MM-dd");
if (f.dtPick.SelectionStart.ToString("yyyy-MM-dd") == f.dtPick.SelectionEnd.ToString("yyyy-MM-dd"))
dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
else
dtED.Text = f.dtPick.SelectionEnd.ToShortDateString();
dtED.Text = f.dtPick.SelectionEnd.ToString("yyyy-MM-dd");
refreshData();
}
@@ -391,7 +391,7 @@ namespace FPJ0000
{
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 toolStripButton4_Click(object sender, EventArgs e)
@@ -505,8 +505,8 @@ namespace FPJ0000
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 toolStripButton7_Click(object sender, EventArgs e)
@@ -514,8 +514,8 @@ namespace FPJ0000
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 btConfAll_CheckStateChanged(object sender, EventArgs e)

4
SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs
View File

@@ -18,11 +18,11 @@ namespace FPJ0000.OtConfirm
InitializeComponent();
var sd = DateTime.Now;
var ed = DateTime.Now;
this.dtSD.Value = DateTime.Parse(sd.ToShortDateString() + " " + dr.stime + ":00");
this.dtSD.Value = DateTime.Parse(sd.ToString("yyyy-MM-dd") + " " + dr.stime + ":00");
if (dr.etime.isEmpty() || dr.etime == "00:00")
this.dtED.Value = DateTime.Now;
else
this.dtED.Value = DateTime.Parse(ed.ToShortDateString() + " " + dr.etime + ":00");
this.dtED.Value = DateTime.Parse(ed.ToString("yyyy-MM-dd") + " " + dr.etime + ":00");
}
protected override void OnLoad(EventArgs e)
{

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

@@ -41,7 +41,7 @@ namespace FPJ0000
e.Row["pidx"] = this.dr.idx;
e.Row["div"] = "";
e.Row["remark"] = string.Empty;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["pdate"] = DateTime.Now.ToString("yyyy-MM-dd");
}
private void fProjectData_Load(object sender, EventArgs e)
{
@@ -410,7 +410,7 @@ namespace FPJ0000
mbody.gcode = FCOMMON.info.Login.gcode;
mbody.cate = mf.cate;
mbody.fromlist = "gw@amkor.co.kr";
mbody.pdate = DateTime.Now.ToShortDateString();
mbody.pdate = DateTime.Now.ToString("yyyy-MM-dd");
mbody.subject = maildataupdate(mf.subject);
mbody.body = maildataupdate(mf.body);
mbody.wuid = FCOMMON.info.Login.no;
@@ -601,22 +601,22 @@ namespace FPJ0000
{
DateTime dt;
var dateStr = ctl.Text.Trim();
if (dateStr == "") dateStr = DateTime.Now.ToShortDateString();
if (dateStr == "") dateStr = DateTime.Now.ToString("yyyy-MM-dd");
else
{
if (DateTime.TryParse(dateStr, out dt)) dateStr = dt.ToShortDateString();
if (DateTime.TryParse(dateStr, out dt)) dateStr = dt.ToString("yyyy-MM-dd");
else
{
FCOMMON.Util.MsgE("날짜 형식으로 변환할 수 없는 문자열 입니다.\n" +
"기준일자가 금일로 변경 됩니다");
dateStr = DateTime.Now.ToShortDateString();
dateStr = DateTime.Now.ToString("yyyy-MM-dd");
}
}
dt = DateTime.Parse(dateStr);
var f = new FCOMMON.fSelectDay(dt);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
ctl.Text = f.dtPick.SelectionStart.ToShortDateString();
ctl.Text = f.dtPick.SelectionStart.ToString("yyyy-MM-dd");
}
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -664,7 +664,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pidx = this.dr.idx;
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
var f = new fHistAddDay(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{

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

@@ -1051,7 +1051,7 @@ namespace FPJ0000
//프로젝트 메모 추가
var newdr = this.dsMSSQL.EETGW_ProjecthistoryD.NewEETGW_ProjecthistoryDRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.remark = string.Empty;
@@ -1075,7 +1075,7 @@ namespace FPJ0000
//주간진행내용 추가
var newdr = this.dsMSSQL.ProjectsHistory.NewProjectsHistoryRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.remark = string.Empty;

6
SubProject/FPJ0000/Project/fProjectListU.cs
View File

@@ -153,7 +153,7 @@ namespace FPJ0000
selCmd.Parameters.Add("username", SqlDbType.VarChar);
selCmd.Parameters.Add("sdate", SqlDbType.VarChar);
selCmd.Parameters["username"].Value = request;
selCmd.Parameters["sdate"].Value = DateTime.Now.AddYears(-5).ToShortDateString();
selCmd.Parameters["sdate"].Value = DateTime.Now.AddYears(-5).ToString("yyyy-MM-dd");
System.Data.SqlClient.SqlDataAdapter sda = new System.Data.SqlClient.SqlDataAdapter();
sda.SelectCommand = selCmd;
@@ -208,9 +208,9 @@ namespace FPJ0000
var uid = cmbUserList.Text.Split('|')[1].Trim();
var sd = dts.Value;// DateTime.Now.AddDays(-7);
var ed = dte.Value;// DateTime.Now;
ta.Fill(dsProjectSummary1.ProjectHrs, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
ta.Fill(dsProjectSummary1.ProjectHrs, FCOMMON.info.Login.gcode, uid, sd.ToString("yyyy-MM-dd"), ed.ToString("yyyy-MM-dd"));
grpsum.Text =$"집계기간:{sd.ToShortDateString()}~{ed.ToShortDateString()}";
grpsum.Text =$"집계기간:{sd.ToString("yyyy-MM-dd")}~{ed.ToString("yyyy-MM-dd")}";
//var ss = chart1.Series[0];
//ss.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.String;
//ss.YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Double;

4
SubProject/FPJ0000/Project/fProjectListUser.cs
View File

@@ -835,7 +835,7 @@ namespace FPJ0000
//프로젝트 메모 추가
var newdr = this.dsMSSQL.EETGW_ProjecthistoryD.NewEETGW_ProjecthistoryDRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.remark = string.Empty;
@@ -859,7 +859,7 @@ namespace FPJ0000
//주간진행내용 추가
var newdr = this.dsMSSQL.ProjectsHistory.NewProjectsHistoryRow();
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.remark = string.Empty;

4
SubProject/FPJ0000/Project/fProjectPartListEdit.cs
View File

@@ -50,11 +50,11 @@ namespace FPJ0000
{
var sd = f.dtPick.SelectionStart;
var dlg = FCOMMON.Util.MsgQ(string.Format("CR# Due Date 값을 변경 할까요?\n" +
"변경전 : {0} -> 변경후 : {1}", textBox2.Text, sd.ToShortDateString()));
"변경전 : {0} -> 변경후 : {1}", textBox2.Text, sd.ToString("yyyy-MM-dd")));
if (dlg == DialogResult.Yes)
{
var taprj = new dsPRJTableAdapters.ProjectsTableAdapter();
var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(projectTextBox.Text), FCOMMON.info.Login.gcode);
var cnt = taprj.UpdateCRDue(sd.ToString("yyyy-MM-dd"), int.Parse(projectTextBox.Text), FCOMMON.info.Login.gcode);
if(cnt != 1)
{
FCOMMON.Util.MsgE($"적용실패 {cnt}건의 자료가 업데이트 됨");

8
SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs
View File

@@ -364,7 +364,7 @@ namespace FPJ0000
// " where import = 1" +
// " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}' and state in ('---','PR','')" +
// " and projectidx = {1}";
//SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString());
//SQLExist = string.Format(SQLExist, dtPdate.Value.ToString("yyyy-MM-dd"), this.ProjectIndex.ToString());
//var ExistCnt = FCOMMON.DBM.ExecuteScalarI(SQLExist);
//if (ExistCnt > 0)
//{
@@ -376,7 +376,7 @@ namespace FPJ0000
// " where import = 1" +
// " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}' and state in ('---','PR','')" +
// " and projectidx = {1}";
// SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString());
// SQLExist = string.Format(SQLExist, dtPdate.Value.ToString("yyyy-MM-dd"), this.ProjectIndex.ToString());
// var delCnt = FCOMMON.DBM.ExecuteNonQuery(SQLExist);
// Console.WriteLine(delCnt.ToString() + "건의 기존 입력된 자료가 삭제됨");
// }
@@ -437,7 +437,7 @@ namespace FPJ0000
if (newadd)
{
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.pdate = dtPdate.Value.ToShortDateString();
newdr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
newdr.state = "---";// cmbState.Text.Trim();
newdr.request = userNo.Trim();
newdr.sid = dr.ItemSid.Replace(" ", "").Trim();
@@ -514,7 +514,7 @@ namespace FPJ0000
{
newdr.process = FCOMMON.info.Login.process;
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.pdate = dtPdate.Value.ToShortDateString();
newdr.pdate = dtPdate.Value.ToString("yyyy-MM-dd");
newdr.state = "---";// cmbState.Text.Trim();
newdr.request = userNo.Trim();
newdr.sid = dr.ItemSid.Replace(" ", "").Trim();

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

@@ -124,7 +124,7 @@ namespace FPJ0000
//시작할떄 cww 를 가져오낟.
var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToShortDateString() + "')";
var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToString("yyyy-MM-dd") + "')";
var cmd = new System.Data.SqlClient.SqlCommand(sql, this.ta.Connection);
cmd.Connection.Open();
var wccstr = cmd.ExecuteScalar();
@@ -830,7 +830,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pidx = this.projectindex;
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.pseq = dr.idx;
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.no = int.Parse(comboBox1.Text);

2
SubProject/FPJ0000/fHistAdd.cs
View File

@@ -36,7 +36,7 @@ namespace FPJ0000
{
this.Validate();
this.dr.remark = tbRemark.Text.Trim();
this.dr.pdate = mcDate.SelectionStart.ToShortDateString();
this.dr.pdate = mcDate.SelectionStart.ToString("yyyy-MM-dd");
DialogResult = System.Windows.Forms.DialogResult.OK;
}
}

2
SubProject/FPJ0000/fHistAddDay.cs
View File

@@ -40,7 +40,7 @@ namespace FPJ0000
{
this.Validate();
this.dr.remark = tbRemark.Text.Trim();
this.dr.pdate = mcDate.SelectionStart.ToShortDateString();
this.dr.pdate = mcDate.SelectionStart.ToString("yyyy-MM-dd");
DialogResult = System.Windows.Forms.DialogResult.OK;
}
}

6
SubProject/FPJ0000/fMailSend.cs
View File

@@ -64,7 +64,7 @@ namespace FPJ0000
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.cate = "PM";
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
dsPRJ.ProjectsRow prjdr = null;
@@ -201,8 +201,8 @@ namespace FPJ0000
try
{
var sd = DateTime.Now.AddDays(-30).ToShortDateString();
var ed = DateTime.Now.ToShortDateString();
var sd = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd");
var ed = DateTime.Now.ToString("yyyy-MM-dd");
this.ta.Fill(this.dsMail.MailData,FCOMMON.info.Login.gcode,sd,ed);
}