181210 chi NR구매등록시 이미지 표시 및 추가 기능
NR구매목록에서 권한 없는 사람이 더블클릭으로 편집할 수 있는 버그 수정
This commit is contained in:
283
Project/fMain.cs
283
Project/fMain.cs
@@ -18,7 +18,7 @@ namespace Project
|
||||
InitializeComponent();
|
||||
this.KeyDown += (s1, e1) =>
|
||||
{
|
||||
if (e1.KeyCode == Keys.F12) btSetting.PerformClick();
|
||||
if (e1.KeyCode == Keys.F12) btSetting.PerformClick();
|
||||
else if (e1.KeyCode == Keys.F11) btLog.PerformClick();
|
||||
else if (e1.KeyCode == Keys.F1 && e1.Control && e1.Shift)
|
||||
{
|
||||
@@ -73,15 +73,15 @@ namespace Project
|
||||
else this.WindowState = FormWindowState.Normal;
|
||||
this.Show();
|
||||
Application.DoEvents();
|
||||
|
||||
|
||||
Pub.barcode = new Device.Barcode();
|
||||
if (!Pub.setting.Barcode.isEmpty()) Pub.barcode.PortName = Pub.setting.Barcode;
|
||||
Pub.barcode.ReceiveData += barcode_ReceiveData;
|
||||
|
||||
UpdateControls();
|
||||
|
||||
|
||||
tmDisplay.Start(); //display timer
|
||||
|
||||
|
||||
|
||||
Dialog.fLogin flogIn = new Dialog.fLogin();
|
||||
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||
@@ -91,13 +91,13 @@ namespace Project
|
||||
|
||||
sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3})",
|
||||
FCOMMON.info.Login.title,
|
||||
FCOMMON.info.Login.no,
|
||||
FCOMMON.info.Login.no,
|
||||
FCOMMON.info.Login.nameK,
|
||||
FCOMMON.info.Login.tel);
|
||||
Pub.log.Add("Program Start");
|
||||
|
||||
bw.RunWorkerAsync(); //background worker
|
||||
if(Pub.setting.startForm == eFormList.NR구매관리)
|
||||
if (Pub.setting.startForm == eFormList.NR구매관리)
|
||||
{
|
||||
menu_nrpurchase();
|
||||
}
|
||||
@@ -112,13 +112,13 @@ namespace Project
|
||||
void barcode_ReceiveData(object sender, Device.Barcode.ReceiveDataEventArgs e)
|
||||
{
|
||||
#region "invoke"
|
||||
if(this.InvokeRequired)
|
||||
if (this.InvokeRequired)
|
||||
{
|
||||
this.BeginInvoke( new EventHandler<Device.Barcode.ReceiveDataEventArgs>(barcode_ReceiveData),new object[]{sender,e} );
|
||||
this.BeginInvoke(new EventHandler<Device.Barcode.ReceiveDataEventArgs>(barcode_ReceiveData), new object[] { sender, e });
|
||||
return;
|
||||
}
|
||||
#endregion
|
||||
Pub.log.Add("BCD", "Rx:"+e.StrValue);
|
||||
Pub.log.Add("BCD", "Rx:" + e.StrValue);
|
||||
}
|
||||
|
||||
void Menu_Log()
|
||||
@@ -145,7 +145,7 @@ namespace Project
|
||||
|
||||
void UpdateControls()
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -161,14 +161,6 @@ namespace Project
|
||||
Menu_Log();
|
||||
}
|
||||
|
||||
private void historyToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void modelToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void listToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
@@ -176,15 +168,17 @@ namespace Project
|
||||
}
|
||||
void menu_work_report()
|
||||
{
|
||||
var f = new FPJ0000.fJobReport();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "WORKBOOK";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FPJ0000.fJobReport());
|
||||
|
||||
}
|
||||
void menu_projecT_list()
|
||||
{
|
||||
var f = new FPJ0000.fProjectList();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "PROJECTS";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FPJ0000.fProjectList());
|
||||
|
||||
}
|
||||
|
||||
private void helpToolStripButton_Click(object sender, EventArgs e)
|
||||
@@ -194,95 +188,43 @@ namespace Project
|
||||
|
||||
private void itemsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.fItems();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "ITEMS";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FCM0000.fItems());
|
||||
}
|
||||
|
||||
private void inventoryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void lineCodesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void equipmentToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void importEquipmentToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void equipmentReportToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void lineCodeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_Management.fLineCode f = new _Management.fLineCode();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void staffGridToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_Info.fInfo_Staff f = new _Info.fInfo_Staff();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "STAFFGRID";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new _Info.fInfo_Staff());
|
||||
|
||||
}
|
||||
|
||||
private void dataToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
FEQ0000.fEquipment f = new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP);
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
string formkey = "EQBUMP";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP));
|
||||
|
||||
private void importToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void reportToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void dataMoldEOLToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
FEQ0000.fEquipment f = new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD);
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "EQMOLD";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD));
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void dataFOLToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL);
|
||||
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void userToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void codeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void userInfoToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
string formkey = "EQFOL";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL));
|
||||
|
||||
}
|
||||
|
||||
@@ -316,82 +258,76 @@ namespace Project
|
||||
|
||||
private void personalInventoryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.fInventory();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
Menu_Inventory();
|
||||
}
|
||||
|
||||
void Menu_Inventory()
|
||||
{
|
||||
string formkey = "INVENTORY";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FCM0000.fInventory());
|
||||
}
|
||||
|
||||
private void minutesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FBS0000.fMinutes();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
|
||||
string formkey = "MINUTES";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FBS0000.fMinutes());
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void holidayToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FBS0000.fHolyday();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "HOLYDAY";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FBS0000.fHolyday());
|
||||
|
||||
}
|
||||
|
||||
private void codesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.fCode();
|
||||
//f.MdiParent = this;
|
||||
f.Show();
|
||||
f.ShowDialog();
|
||||
}
|
||||
|
||||
private void mailFormToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
FCM0000.fMailform f = new FCM0000.fMailform();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "MAILFORM";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FCM0000.fMailform());
|
||||
|
||||
}
|
||||
|
||||
private void requestITemToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.fRequestItem();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "ITEMREQUEST";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FCM0000.fRequestItem());
|
||||
|
||||
}
|
||||
|
||||
private void toolStripButton1_Click(object sender, EventArgs e)
|
||||
{
|
||||
if(FCOMMON.info.Login.level < 10)
|
||||
if (FCOMMON.info.Login.level < 10)
|
||||
{
|
||||
FCOMMON.Util.MsgE("테스트 기능이므로 개발자만 사용가능 합니다.");
|
||||
return;
|
||||
}
|
||||
FCM0000.fSendMail f = new FCM0000.fSendMail();
|
||||
f.MdiParent = this;
|
||||
//f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
FEQ0000.fPurchase fpurchase = null;
|
||||
void menu_nrpurchase()
|
||||
{
|
||||
if(Pub.setting.DupWindow)
|
||||
{
|
||||
var f = new FEQ0000.fPurchase();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
if(fpurchase == null || fpurchase.IsDisposed)
|
||||
{
|
||||
fpurchase = new FEQ0000.fPurchase();
|
||||
fpurchase.MdiParent = this;
|
||||
fpurchase.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (fpurchase.WindowState == FormWindowState.Minimized) fpurchase.WindowState = FormWindowState.Normal;
|
||||
fpurchase.Show();
|
||||
fpurchase.Activate();
|
||||
}
|
||||
}
|
||||
|
||||
string formkey = "PUCHASE";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FEQ0000.fPurchase());
|
||||
|
||||
|
||||
}
|
||||
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
@@ -401,22 +337,23 @@ namespace Project
|
||||
private void purchaseImportToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FEQ0000.fPurchase_Import();
|
||||
f.MdiParent = this;
|
||||
// f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void purchaseDataConvertToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FEQ0000.fPurchase_Data();
|
||||
f.MdiParent = this;
|
||||
// f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void customerToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
string formkey = "CUSTOMS";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new FCM0000.fCustoms());
|
||||
var f = new FCM0000.fCustoms();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void toolStripButton2_Click(object sender, EventArgs e)
|
||||
@@ -432,21 +369,25 @@ namespace Project
|
||||
|
||||
private void aDSUserListToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
if(FCOMMON.info.Login.level < 10)
|
||||
|
||||
|
||||
if (FCOMMON.info.Login.level < 10)
|
||||
{
|
||||
FCOMMON.Util.MsgE("개발자 이상 사용가능한 메뉴 입니다.");
|
||||
return;
|
||||
}
|
||||
var f = new _Common.fADSUserList();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
|
||||
string formkey = "ADUSERS";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new _Common.fADSUserList());
|
||||
}
|
||||
|
||||
private void myAccouserToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new _Common.fUserList();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
string formkey = "USERS";
|
||||
if (!ShowForm(formkey))
|
||||
AddForm(formkey, new _Common.fUserList());
|
||||
|
||||
}
|
||||
|
||||
private void toolStripButton3_Click(object sender, EventArgs e)
|
||||
@@ -461,26 +402,62 @@ namespace Project
|
||||
|
||||
private void toolStripButton4_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.fInventory();
|
||||
f.MdiParent = this;
|
||||
f.Show();
|
||||
Menu_Inventory();
|
||||
}
|
||||
|
||||
private void customerImportToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new FCM0000.Customer_Import();
|
||||
f.MdiParent = this;
|
||||
// f.MdiParent = this;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void staffToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
Boolean ShowForm(string key)
|
||||
{
|
||||
int tabIndex = this.tabControl1.TabPages.IndexOfKey(key);
|
||||
if (tabIndex != -1)
|
||||
{
|
||||
this.tabControl1.SelectedIndex = tabIndex;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
void AddForm(string key, Form f)
|
||||
{
|
||||
f.TopLevel = false;
|
||||
f.Dock = DockStyle.Fill;
|
||||
f.ControlBox = false;
|
||||
f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||
this.tabControl1.TabPages.Add(key, f.Text);
|
||||
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BorderStyle = BorderStyle.Fixed3D;
|
||||
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Padding = new Padding(10, 10, 10, 10);
|
||||
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BackColor = Color.LightGray;
|
||||
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].ContextMenuStrip = this.cmTab;
|
||||
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Controls.Add(f);
|
||||
this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1;
|
||||
f.Show();
|
||||
}
|
||||
|
||||
private void 라인코드관리ToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_Management.fLineCode f = new _Management.fLineCode();
|
||||
f.ShowDialog();
|
||||
}
|
||||
|
||||
private void toolStripContainer1_ContentPanel_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void 업체담당자ToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
private void tabControl1_DrawItem(object sender, DrawItemEventArgs e)
|
||||
{
|
||||
|
||||
//e.Graphics.FillRectangle(Brushes.Red, e.Bounds);
|
||||
e.DrawBackground();
|
||||
e.DrawFocusRectangle();
|
||||
e.Graphics.DrawString(this.tabControl1.TabPages[e.Index].Text, e.Font, new SolidBrush(e.ForeColor), e.Bounds);
|
||||
var tabpos = this.PointToClient(new Point(tabControl1.Left, tabControl1.Top));
|
||||
e.Graphics.DrawString("X", this.Font, Brushes.Black, tabControl1.Right - 50, tabControl1.Top);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user