업무일지 프로세스 선택화면 크기 변경 및 목록에서 비활성계정의 데이터 나오지 않게 함
This commit is contained in:
@@ -6,6 +6,7 @@ using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Net.Configuration;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
|
||||
@@ -28,10 +29,10 @@ namespace FPJ0000.JobReport_
|
||||
this.tbProcess.Items.Clear();
|
||||
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
//사용자의 공정명을 선택해준다
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
|
||||
@@ -33,10 +33,10 @@ namespace FPJ0000.JobReport_
|
||||
this.tbProcess.Items.Clear();
|
||||
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
//사용자의 공정명을 선택해준다
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
|
||||
@@ -97,8 +97,8 @@ namespace FPJ0000
|
||||
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
|
||||
//공정목록
|
||||
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
//var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
//cmbProcess.Items.Clear();
|
||||
//cmbProcess.Items.Add("--전체--");
|
||||
//foreach (dsReport.ProcessListRow dr in dtProcList)
|
||||
|
||||
@@ -33,13 +33,13 @@ namespace FPJ0000
|
||||
EnsureVisibleAndUsableSize();
|
||||
|
||||
//공정목록
|
||||
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = FCOMMON.DBM.GroupUserProcessList();//taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
cmbProcess.Items.Clear();
|
||||
cmbProcess.Items.Add("--전체--");
|
||||
foreach (dsReport.ProcessListRow dr in dtProcList)
|
||||
foreach (var dr in dtProcList)
|
||||
{
|
||||
cmbProcess.Items.Add(dr.processs);
|
||||
cmbProcess.Items.Add(dr);
|
||||
}
|
||||
cmbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
|
||||
|
||||
@@ -45,15 +45,15 @@ namespace FPJ0000.JobReport_
|
||||
this.cmbProcess.FormattingEnabled = true;
|
||||
this.cmbProcess.Location = new System.Drawing.Point(0, 25);
|
||||
this.cmbProcess.Name = "cmbProcess";
|
||||
this.cmbProcess.Size = new System.Drawing.Size(289, 328);
|
||||
this.cmbProcess.Size = new System.Drawing.Size(465, 576);
|
||||
this.cmbProcess.TabIndex = 0;
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
|
||||
this.button1.Location = new System.Drawing.Point(0, 353);
|
||||
this.button1.Location = new System.Drawing.Point(0, 601);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(289, 39);
|
||||
this.button1.Size = new System.Drawing.Size(465, 39);
|
||||
this.button1.TabIndex = 2;
|
||||
this.button1.Text = "확인";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
@@ -67,7 +67,7 @@ namespace FPJ0000.JobReport_
|
||||
this.toolStripButton3});
|
||||
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
|
||||
this.toolStrip1.Name = "toolStrip1";
|
||||
this.toolStrip1.Size = new System.Drawing.Size(289, 25);
|
||||
this.toolStrip1.Size = new System.Drawing.Size(465, 25);
|
||||
this.toolStrip1.TabIndex = 1;
|
||||
this.toolStrip1.Text = "toolStrip1";
|
||||
//
|
||||
@@ -102,7 +102,7 @@ namespace FPJ0000.JobReport_
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(289, 392);
|
||||
this.ClientSize = new System.Drawing.Size(465, 640);
|
||||
this.Controls.Add(this.cmbProcess);
|
||||
this.Controls.Add(this.toolStrip1);
|
||||
this.Controls.Add(this.button1);
|
||||
|
||||
@@ -24,15 +24,17 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
EnsureVisibleAndUsableSize();
|
||||
//공정목록
|
||||
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
|
||||
var prclist = FCOMMON.DBM.GroupUserProcessList();
|
||||
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
//var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
cmbProcess.Items.Clear();
|
||||
//cmbProcess.Items.Add("--전체--");
|
||||
|
||||
foreach (dsReport.ProcessListRow dr in dtProcList)
|
||||
foreach (var dr in prclist)
|
||||
{
|
||||
cmbProcess.Items.Add(dr.processs);
|
||||
if (values.Contains(dr.processs))
|
||||
cmbProcess.Items.Add(dr);
|
||||
if (values.Contains(dr))
|
||||
{
|
||||
this.cmbProcess.SetItemChecked(cmbProcess.Items.Count - 1, true);
|
||||
}
|
||||
@@ -50,8 +52,8 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
values.Add(cmbProcess.Items[i].ToString());
|
||||
}
|
||||
}
|
||||
if(values.Count < 1)
|
||||
}
|
||||
if (values.Count < 1)
|
||||
{
|
||||
FCOMMON.Util.MsgE("공정선택이 필요 합니다");
|
||||
return;
|
||||
|
||||
@@ -23,10 +23,10 @@ namespace FPJ0000.JobReport_
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("전체");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -27,10 +27,10 @@ namespace FPJ0000.JobReport_
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("전체");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -23,10 +23,10 @@ namespace FPJ0000.JobReport_
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("전체");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
//this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -27,10 +27,10 @@ namespace FPJ0000.JobReport_
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -34,10 +34,10 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
//this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -28,10 +28,10 @@ namespace FPJ0000.JobReport_
|
||||
EnsureVisibleAndUsableSize();
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
@@ -31,10 +31,10 @@ namespace FPJ0000.JobReport_
|
||||
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("--전체--");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (var dr in dtProcessList)
|
||||
tbProcess.Items.Add(dr);
|
||||
|
||||
//사용자의 공정명을 선택해준다
|
||||
this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
|
||||
Reference in New Issue
Block a user