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

warn clear

Browse Source
This commit is contained in:
ChiKyun Kim
2025-07-15 09:56:28 +09:00
parent 479a736b80
commit 2b322542f1
26 changed files with 53 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SubProject/CMSControl/.vs/UMSControl.csproj.dtbcache.json
View File

@@ -1 +1 @@
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.pdb","OutputItemRelativePath":"UMSControl.pdb"}],"CopyToOutputEntries":[]}
{"RootPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

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

File diff suppressed because one or more lines are too long

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

@@ -43,25 +43,8 @@ namespace FBS0000
//데이터를 재 집계한다.
this.dsReport.holydatasum.Clear();
//1월1일년차데이터는 이월로 변경한다..
//var 이월데이터 = dsReport.holydata.Where(t => t.cate.StartsWith("이월") == false && t.cate.Contains("이월")).ToList();
//foreach (var dr in 이월데이터)
//{
// var basecate = dr.cate.Split('-')[0].Trim();
// dr.cate = basecate;
// dr.iwol = true;
//}
var grp_user = dsReport.holydata.GroupBy(t => t.uid).ToList();
var sum_drday = 0.0;
var sum_crday = 0.0;
var sum_addday = 0.0;
var sum_janday = 0.0;
var sum_iwol = 0.0;
foreach (var grp in grp_user)
{
//cate group

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

File diff suppressed because one or more lines are too long

2
SubProject/FCM0000/fCode.cs
View File

@@ -324,7 +324,7 @@ namespace FCM0000
bs.Filter = filter.Replace("{0}", text);
tbFind.BackColor = Color.Lime;
}
catch (System.Exception ex)
catch
{
tbFind.BackColor = Color.Tomato;
}

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

File diff suppressed because one or more lines are too long

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

@@ -835,7 +835,7 @@ namespace FEQ0000
}
//수집된데이터를 보내야한다.
var idx = 0;
//var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
@@ -886,7 +886,7 @@ namespace FEQ0000
//수집된데이터를 보내야한다.
var idx = 0;
//var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
@@ -1444,7 +1444,7 @@ namespace FEQ0000
//수집된데이터를 보내야한다.
List<dsPurchase.EETGW_PurchaseCRRow> rows = new List<dsPurchase.EETGW_PurchaseCRRow>();
var idx = 0;
// var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);

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

@@ -1153,7 +1153,7 @@ namespace FEQ0000
}
//수집된데이터를 보내야한다.
var idx = 0;
//var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
@@ -1206,7 +1206,7 @@ namespace FEQ0000
}
//수집된데이터를 보내야한다.
var idx = 0;
//var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);

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

@@ -1146,7 +1146,6 @@ namespace FEQ0000
}
//수집된데이터를 보내야한다.
var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
@@ -1196,8 +1195,6 @@ namespace FEQ0000
}
//수집된데이터를 보내야한다.
var idx = 0;
foreach (var i in rowidxs)
{
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);

2
SubProject/FEQ0000/fUserExportColumn.cs
View File

@@ -245,7 +245,7 @@ namespace FEQ0000
book = new libxl.XmlBook();
book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey);
var sheet = book.addSheet("data");
var colno = 0;
//var colno = 0;
var rowno = 0;
for (int i = 0; i < this.listView1.Columns.Count; i++)
{

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

File diff suppressed because one or more lines are too long

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

@@ -323,8 +323,8 @@ namespace FPJ0000.JobReport_
//ETC영역계산
{
//전체합산데이터와, 2~10까지의 데이터가 일치하지 않으면 그것이 ETC이다
var etchr = item.Where(t => t.hrs != null).Sum(t => (float)t.hrs);
var etcot = item.Where(t => t.ot != null).Sum(t => (float)t.ot);
var etchr = item.Sum(t => (float)t.hrs);
var etcot = item.Sum(t => (float)t.ot);
//현재데이터의 hrs의 합
var subtotal = 0f;

1
SubProject/FPJ0000/JobReport_/fJobProcessSelect.Designer.cs generated
View File

@@ -707,7 +707,6 @@
private System.Windows.Forms.TreeView treeView1;
private System.Windows.Forms.Button btRefreshTreeview;
private System.Windows.Forms.Label lbWarningManager;
private System.Windows.Forms.DataGridViewTextBoxColumn svalue2DataGridViewTextBoxColumn;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.GroupBox groupBox4;

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

@@ -134,7 +134,7 @@ namespace FPJ0000.JobReport_
var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
//데이터를 추가한다.
bool addholy = false;
//bool addholy = false;
foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.PrjName))
{
var pidx = dr.Key;
@@ -151,13 +151,13 @@ namespace FPJ0000.JobReport_
{
row.Add("--");
row.Add("미팅");
addholy = true;
//addholy = true;
}
else if (dr.Key == "휴가")
{
row.Add("--");
row.Add("휴가");
addholy = true;
//addholy = true;
}
else
{

3
SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs generated
View File

@@ -206,10 +206,7 @@ namespace FPJ0000.OtConfirm
}
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btOK;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
public System.Windows.Forms.NumericUpDown nudValuePMS;
public System.Windows.Forms.RadioButton radAllPMS;
public System.Windows.Forms.RadioButton radAll;

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

@@ -768,8 +768,8 @@ namespace FPJ0000
private void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
{
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
var colr = "dvc_qtyreq";
var col = "dvc_qty";
// var colr = "dvc_qtyreq";
// var col = "dvc_qty";
//dv1.Rows[e.RowIndex].Cells[e.ColumnIndex]
}

61
SubProject/FPJ0000/SaveCost/fSaveCostList.cs
View File

@@ -351,35 +351,35 @@ namespace FPJ0000
util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요");
return;
var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.edate = DateTime.Now.ToString("yyyy-MM-dd");
newdr.userManager = FCOMMON.info.Login.nameK;
newdr.userprocess = FCOMMON.info.Login.process;
newdr.costn = 0;
newdr.costo = 0;
newdr.cnt = 1;
newdr.name = "Project Title";
var f = new fSaveCostData(newdr);
f.StartPosition = FormStartPosition.CenterScreen;
var dlg = f.ShowDialog();
if (dlg == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
try
{
//var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
//newdr.wuid = FCOMMON.info.Login.no;
//newdr.wdate = DateTime.Now;
//newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
//newdr.edate = DateTime.Now.ToString("yyyy-MM-dd");
//newdr.userManager = FCOMMON.info.Login.nameK;
//newdr.userprocess = FCOMMON.info.Login.process;
//newdr.costn = 0;
//newdr.costo = 0;
//newdr.cnt = 1;
//newdr.name = "Project Title";
//var f = new fSaveCostData(newdr);
//f.StartPosition = FormStartPosition.CenterScreen;
//var dlg = f.ShowDialog();
//if (dlg == System.Windows.Forms.DialogResult.OK)
//{
// this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
// try
// {
ta.Update(newdr);
}
catch (Exception ex)
{
FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
}
// ta.Update(newdr);
// }
// catch (Exception ex)
// {
// FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
// }
}
else newdr.Delete();
//}
//else newdr.Delete();
}
private void btEdit_Click(object sender, EventArgs e)
@@ -442,13 +442,6 @@ namespace FPJ0000
{
util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요");
return;
var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = DateTime.Now.ToShortDateString();
newdr.gcode = FCOMMON.info.Login.gcode;
this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
}
}
}

1
SubProject/FPJ0000/fMailSend.Designer.cs generated
View File

@@ -832,7 +832,6 @@
private System.Windows.Forms.TextBox textBox3;
private dsMail dsMail;
private dsMailTableAdapters.MailDataTableAdapter ta;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private YARTE.UI.HtmlEditor htmlEditor1;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripButton toolStripButton3;