....
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -263,7 +263,7 @@ namespace FPJ0000.JobReport_
|
||||
this.progressBar2.Value += 1;
|
||||
var item = baseData.Where(t => t.process == prcitem.memo); //해당 프로세스에 해당하는 아이템을 가져온다
|
||||
//}
|
||||
|
||||
if (prcitem.memo == null) prcitem.memo = string.Empty;
|
||||
if(prcitem.memo.StartsWith("ASM Feeder Center"))
|
||||
Console.WriteLine("sdf");
|
||||
|
||||
|
||||
@@ -14,37 +14,7 @@ namespace FPJ0000.OtConfirm
|
||||
{
|
||||
dsPRJ.JobReportRow[] dr;
|
||||
Boolean binit = false;
|
||||
//public fOTConfirmOK(dsPRJ.JobReportRow dr_)
|
||||
//{
|
||||
// InitializeComponent();
|
||||
// dr = dr_;
|
||||
|
||||
// //var userlist = FCOMMON.DBM.getUserTable();
|
||||
// //this.cmbUser.DataSource = userlist;
|
||||
// //this.cmbUser.ValueMember = "id";
|
||||
// //this.cmbUser.DisplayMember = "dispname";
|
||||
|
||||
// //textBox1.Text = dr.username;
|
||||
// //textBox2.Text = dr.pdate;
|
||||
// //textBox3.Text = dr.projectName;
|
||||
// //tbRemark.Text = dr.description;
|
||||
// //numericUpDown2.Value = (decimal)dr.ot;
|
||||
// //tbRemark.ImeMode = ImeMode.Hangul;
|
||||
|
||||
|
||||
|
||||
// //var dt = DateTime.Parse(dr.pdate);
|
||||
// //textBox2.Text = dt.ToLongDateString();
|
||||
|
||||
// //if(dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday)
|
||||
// //{
|
||||
// // numericUpDown1.Value = (decimal)(dr.ot * 1.5f);
|
||||
// //}
|
||||
// //else
|
||||
// //{
|
||||
// // numericUpDown1.Value = (decimal)dr.ot;
|
||||
// //}
|
||||
//}
|
||||
public fOTConfirmOK(dsPRJ.JobReportRow[] dr_)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -480,13 +480,15 @@ namespace FPJ0000
|
||||
if (col == curyw)
|
||||
{
|
||||
e.Graphics.FillRectangle(Brushes.DeepSkyBlue, rect);
|
||||
e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Graphics.FillRectangle(Brushes.DimGray, rect);
|
||||
e.Graphics.DrawString(col, this.Font, Brushes.White, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
|
||||
}
|
||||
e.Graphics.DrawRectangle(Pens.Black, rect.Left, rect.Top, rect.Width, rect.Height);
|
||||
e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
|
||||
|
||||
ci += 1;
|
||||
}
|
||||
|
||||
@@ -581,7 +583,7 @@ namespace FPJ0000
|
||||
{
|
||||
e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[시작 안함]",
|
||||
this.Font,
|
||||
(isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime),
|
||||
(isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime),
|
||||
rect2,
|
||||
new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center }
|
||||
);
|
||||
@@ -590,7 +592,7 @@ namespace FPJ0000
|
||||
{
|
||||
e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[{dr.progress:N1}% 진행 중]",
|
||||
this.Font,
|
||||
(isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime),
|
||||
(isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime),
|
||||
rect2,
|
||||
new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center }
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user