190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함

품목정보 정렬 기능 추가
190731  로그기록화면(beta)추가
This commit is contained in:
chikyun.kim
2019-08-06 11:38:05 +09:00
parent 11d7c7f704
commit 63dffe62ef
95 changed files with 21458 additions and 845 deletions

View File

@@ -31,15 +31,15 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin));
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.cmbDept = new System.Windows.Forms.ComboBox();
this.tbID = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tbPW = new System.Windows.Forms.TextBox();
this.panel2 = new System.Windows.Forms.Panel();
this.btLogin = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.cmbDept = new System.Windows.Forms.ComboBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
@@ -58,9 +58,9 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
this.panel1.Controls.Add(this.linkLabel2);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.cmbDept);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.tbID);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
@@ -72,6 +72,28 @@
this.panel1.Size = new System.Drawing.Size(488, 366);
this.panel1.TabIndex = 0;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.linkLabel1.Location = new System.Drawing.Point(12, 126);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(31, 15);
this.linkLabel1.TabIndex = 0;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "부서";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// cmbDept
//
this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F);
this.cmbDept.FormattingEnabled = true;
this.cmbDept.Location = new System.Drawing.Point(15, 144);
this.cmbDept.Name = "cmbDept";
this.cmbDept.Size = new System.Drawing.Size(460, 41);
this.cmbDept.TabIndex = 1;
//
// tbID
//
this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F);
@@ -134,38 +156,19 @@
this.btLogin.UseVisualStyleBackColor = true;
this.btLogin.Click += new System.EventHandler(this.button1_Click);
//
// label3
// linkLabel2
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label3.ForeColor = System.Drawing.Color.DodgerBlue;
this.label3.Location = new System.Drawing.Point(15, 340);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(243, 15);
this.label3.TabIndex = 6;
this.label3.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567";
this.label3.Click += new System.EventHandler(this.label3_Click);
//
// cmbDept
//
this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F);
this.cmbDept.FormattingEnabled = true;
this.cmbDept.Location = new System.Drawing.Point(15, 144);
this.cmbDept.Name = "cmbDept";
this.cmbDept.Size = new System.Drawing.Size(460, 41);
this.cmbDept.TabIndex = 1;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.linkLabel1.Location = new System.Drawing.Point(12, 126);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(31, 15);
this.linkLabel1.TabIndex = 0;
this.linkLabel1.Text = "부서";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
this.linkLabel2.AutoSize = true;
this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.linkLabel2.ForeColor = System.Drawing.Color.DodgerBlue;
this.linkLabel2.LinkColor = System.Drawing.Color.DodgerBlue;
this.linkLabel2.Location = new System.Drawing.Point(12, 339);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(243, 15);
this.linkLabel2.TabIndex = 7;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// fLogin
//
@@ -199,8 +202,8 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox tbID;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox cmbDept;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.LinkLabel linkLabel2;
}
}

View File

@@ -124,7 +124,7 @@ namespace Project.Dialog
private void label3_Click(object sender, EventArgs e)
{
FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr");
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -137,5 +137,10 @@ namespace Project.Dialog
cmbDept.Text = f.deptName;
}
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr");
}
}
}

118
Project/Dialog/fSelectDept.Designer.cs generated Normal file
View File

@@ -0,0 +1,118 @@
namespace Project.Dialog
{
partial class fSelectDept
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.dsMSSQL = new Project.dsMSSQL();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new Project.dsMSSQLTableAdapters.UserGroupTableAdapter();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.SuspendLayout();
//
// fpSpread1
//
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.Location = new System.Drawing.Point(0, 0);
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(495, 562);
this.fpSpread1.TabIndex = 5;
//
// dsMSSQL
//
this.dsMSSQL.DataSetName = "dsMSSQL";
this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bs
//
this.bs.DataMember = "UserGroup";
this.bs.DataSource = this.dsMSSQL;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 1;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "부서명";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 32F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "dept";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "부서명";
this.fpSpread1_Sheet1.Columns.Get(0).Width = 413F;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// fSelectDept
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(495, 562);
this.Controls.Add(this.fpSpread1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fSelectDept";
this.Text = "부서목록";
this.Load += new System.EventHandler(this.fSelectDept_Load);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private FarPoint.Win.Spread.FpSpread fpSpread1;
private dsMSSQL dsMSSQL;
private System.Windows.Forms.BindingSource bs;
private dsMSSQLTableAdapters.UserGroupTableAdapter ta;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}

View File

@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fSelectDept : FCOMMON.fBase
{
public string deptName { get; set; }
public fSelectDept()
{
InitializeComponent();
deptName = string.Empty;
this.fpSpread1.KeyDown += (s1, e1) => { SelectData(); };
this.fpSpread1.CellDoubleClick += (s1, e1) => { SelectData(); };
}
private void fSelectDept_Load(object sender, EventArgs e)
{
// TODO: 이 코드는 데이터를 'dsMSSQL.UserGroup' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다.
this.ta.Fill(this.dsMSSQL.UserGroup);
var ta = new dsMSSQLTableAdapters.UserGroupTableAdapter();
}
void SelectData()
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMSSQL.UserGroupRow;
this.deptName = dr.dept;
this.DialogResult = System.Windows.Forms.DialogResult.OK;
}
}
}

View File

@@ -0,0 +1,132 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>248, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>186, 17</value>
</metadata>
</root>

View File

@@ -459,6 +459,10 @@
<Project>{c2e0627d-0623-4b68-a558-37cbce6bdca6}</Project>
<Name>FEQ0000</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\FLG0000\FLG0000.csproj">
<Project>{0677fb12-d582-4a7a-b266-ef2477a89688}</Project>
<Name>FLG0000</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\FPJ0000\FPJ0000.csproj">
<Project>{74836a5f-cb5b-449f-9210-99c9d1a23b97}</Project>
<Name>FPJ0000</Name>

View File

@@ -1,4 +1,6 @@
* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인
190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함
품목정보 정렬 기능 추가
190718 chi 목록조회화면에서 열 너비가 자동 불러오게 함
190711 chi 프로젝트목록 엑셀저장시 컬럼도 저장되게
190423 chi 프로젝트 편집창에 FTP Explorer 기능 추가

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("19.07.26.1730")]
[assembly: AssemblyFileVersion("19.07.26.1730")]
[assembly: AssemblyVersion("19.08.06.1130")]
[assembly: AssemblyFileVersion("19.08.06.1130")]

View File

@@ -12,6 +12,9 @@ namespace Project
NR구매관리,
,
,
,
,
}
public class Setting : arUtil.Setting
{

View File

@@ -51,22 +51,23 @@
this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menu_kuntae = new System.Windows.Forms.ToolStripMenuItem();
this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem();
this.mn_logdata = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menu_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.menu_project = new System.Windows.Forms.ToolStripMenuItem();
this.menu_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
this.menu_jago = new System.Windows.Forms.ToolStripMenuItem();
this.menu_eq = new System.Windows.Forms.ToolStripMenuItem();
this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.mn_project = new System.Windows.Forms.ToolStripMenuItem();
this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
this.mn_jago = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_eq = new System.Windows.Forms.ToolStripMenuItem();
this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.boardsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -88,6 +89,8 @@
this.addSIdDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
@@ -162,8 +165,9 @@
this.btSetting,
this.ToolStripMenuItem,
this.commonToolStripMenuItem,
this.mn_logdata,
this.managementToolStripMenuItem,
this.boardsToolStripMenuItem,
this.mn_docu,
this.ToolStripMenuItem,
this.btDev});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
@@ -196,9 +200,7 @@
this.itemsToolStripMenuItem,
this.userInfoToolStripMenuItem,
this.customerToolStripMenuItem,
this.menu_kuntae,
this.staffGridToolStripMenuItem,
this.mailFormToolStripMenuItem});
this.mn_kuntae});
this.commonToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("commonToolStripMenuItem.Image")));
this.commonToolStripMenuItem.Name = "commonToolStripMenuItem";
this.commonToolStripMenuItem.Size = new System.Drawing.Size(93, 23);
@@ -256,87 +258,96 @@
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// menu_kuntae
// mn_kuntae
//
this.menu_kuntae.Name = "menu_kuntae";
this.menu_kuntae.Size = new System.Drawing.Size(153, 24);
this.menu_kuntae.Text = "월별 근무표";
this.menu_kuntae.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_kuntae.Name = "mn_kuntae";
this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
this.mn_kuntae.Text = "월별 근무표";
this.mn_kuntae.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// staffGridToolStripMenuItem
// mn_logdata
//
this.staffGridToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
// mailFormToolStripMenuItem
//
this.mailFormToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.mailFormToolStripMenuItem.Text = "메일 양식";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
this.mn_logdata.Image = ((System.Drawing.Image)(resources.GetObject("mn_logdata.Image")));
this.mn_logdata.Name = "mn_logdata";
this.mn_logdata.Size = new System.Drawing.Size(65, 23);
this.mn_logdata.Text = "기록";
this.mn_logdata.Click += new System.EventHandler(this.mn_logdata_Click);
//
// managementToolStripMenuItem
//
this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menu_purchase,
this.menu_project,
this.menu_dailyhistory,
this.menu_jago,
this.menu_eq,
this.mn_purchase,
this.mn_project,
this.mn_dailyhistory,
this.mn_jago,
this.mn_eq,
this.personalInventoryToolStripMenuItem});
this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image")));
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.managementToolStripMenuItem.Text = "관리";
//
// menu_purchase
// mn_purchase
//
this.menu_purchase.Image = ((System.Drawing.Image)(resources.GetObject("menu_purchase.Image")));
this.menu_purchase.Name = "menu_purchase";
this.menu_purchase.Size = new System.Drawing.Size(153, 24);
this.menu_purchase.Text = "구매신청";
this.menu_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image")));
this.mn_purchase.Name = "mn_purchase";
this.mn_purchase.Size = new System.Drawing.Size(153, 24);
this.mn_purchase.Text = "구매신청";
this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// menu_project
// mn_project
//
this.menu_project.Image = ((System.Drawing.Image)(resources.GetObject("menu_project.Image")));
this.menu_project.Name = "menu_project";
this.menu_project.Size = new System.Drawing.Size(153, 24);
this.menu_project.Text = "프로젝트";
this.menu_project.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image")));
this.mn_project.Name = "mn_project";
this.mn_project.Size = new System.Drawing.Size(153, 24);
this.mn_project.Text = "프로젝트";
this.mn_project.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// menu_dailyhistory
// mn_dailyhistory
//
this.menu_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("menu_dailyhistory.Image")));
this.menu_dailyhistory.Name = "menu_dailyhistory";
this.menu_dailyhistory.Size = new System.Drawing.Size(153, 24);
this.menu_dailyhistory.Text = "업무일지";
this.menu_dailyhistory.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image")));
this.mn_dailyhistory.Name = "mn_dailyhistory";
this.mn_dailyhistory.Size = new System.Drawing.Size(153, 24);
this.mn_dailyhistory.Text = "업무일지";
this.mn_dailyhistory.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// menu_jago
// mn_jago
//
this.menu_jago.Image = ((System.Drawing.Image)(resources.GetObject("menu_jago.Image")));
this.menu_jago.Name = "menu_jago";
this.menu_jago.Size = new System.Drawing.Size(153, 24);
this.menu_jago.Text = "품목재고";
this.menu_jago.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image")));
this.mn_jago.Name = "mn_jago";
this.mn_jago.Size = new System.Drawing.Size(153, 24);
this.mn_jago.Text = "품목재고";
this.mn_jago.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// menu_eq
// 관리ToolStripMenuItem
//
this.menu_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem.Name = "관리ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem.Text = "재고관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 재고현황ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "재고현황ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem.Text = "재고현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// mn_eq
//
this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dataFOLToolStripMenuItem,
this.dataMoldEOLToolStripMenuItem,
this.dataToolStripMenuItem,
this.toolStripMenuItem2,
this.ToolStripMenuItem});
this.menu_eq.Image = ((System.Drawing.Image)(resources.GetObject("menu_eq.Image")));
this.menu_eq.Name = "menu_eq";
this.menu_eq.Size = new System.Drawing.Size(153, 24);
this.menu_eq.Text = "장비 목록";
this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
this.mn_eq.Name = "mn_eq";
this.mn_eq.Size = new System.Drawing.Size(153, 24);
this.mn_eq.Text = "장비 목록";
//
// dataFOLToolStripMenuItem
//
@@ -380,9 +391,9 @@
this.personalInventoryToolStripMenuItem.Visible = false;
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// boardsToolStripMenuItem
// mn_docu
//
this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem1,
this.minutesToolStripMenuItem,
this.holidayToolStripMenuItem,
@@ -391,10 +402,10 @@
this.bugReportToolStripMenuItem,
this.todoListToolStripMenuItem,
this.ToolStripMenuItem});
this.boardsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("boardsToolStripMenuItem.Image")));
this.boardsToolStripMenuItem.Name = "boardsToolStripMenuItem";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.boardsToolStripMenuItem.Text = "문서";
this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image")));
this.mn_docu.Name = "mn_docu";
this.mn_docu.Size = new System.Drawing.Size(65, 23);
this.mn_docu.Text = "문서";
//
// 패치내역ToolStripMenuItem1
//
@@ -477,7 +488,9 @@
this.workReportImportToolStripMenuItem,
this.addSIdDataToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem1});
this.ToolStripMenuItem1,
this.toolStripMenuItem1,
this.toolStripMenuItem3});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(91, 23);
@@ -561,6 +574,22 @@
this.ToolStripMenuItem1.Text = "그룹정보";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem1.Text = "Staff Grid";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem3.Text = "메일 양식";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -619,13 +648,12 @@
private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel sbLogin;
private System.Windows.Forms.ToolStripMenuItem codesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem boardsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_docu;
private System.Windows.Forms.ToolStripMenuItem freeBoardToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bugReportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem todoListToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem managementToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_eq;
private System.Windows.Forms.ToolStripMenuItem staffGridToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_eq;
private System.Windows.Forms.ToolStripMenuItem dataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataFOLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataMoldEOLToolStripMenuItem;
@@ -633,9 +661,8 @@
private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem holidayToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mailFormToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem requestITemToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_purchase;
private System.Windows.Forms.ToolStripMenuItem mn_purchase;
private System.Windows.Forms.ToolStripMenuItem btDev;
private System.Windows.Forms.ToolStripMenuItem purchaseImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem;
@@ -649,21 +676,26 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_project;
private System.Windows.Forms.ToolStripMenuItem mn_project;
private System.Windows.Forms.ToolStripMenuItem projectImportCompleteToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem purchaseOrderImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_dailyhistory;
private System.Windows.Forms.ToolStripMenuItem mn_dailyhistory;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem workReportImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_kuntae;
private System.Windows.Forms.ToolStripMenuItem mn_kuntae;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_jago;
private System.Windows.Forms.ToolStripMenuItem mn_jago;
private System.Windows.Forms.ToolStripMenuItem addSIdDataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem mn_logdata;
}
}

View File

@@ -116,12 +116,14 @@ namespace Project
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
this.menu_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
this.menu_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
this.menu_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
this.menu_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
this.menu_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.menu_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
this.mn_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
this.mn_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.mn_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu);
this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
@@ -138,21 +140,41 @@ namespace Project
}
void Func_RunStartForm()
{
var menu_purchaseVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
var menu_projectVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
var menu_dailyhistoryVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
var menu_jagoVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
var menu_eqVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
//시작폼 확인
if (Pub.setting.startForm == eFormList.NR구매관리)
if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible==true)
{
menu_nrpurchase();
}
else if (Pub.setting.startForm == eFormList.)
else if (Pub.setting.startForm == eFormList. && menu_dailyhistoryVisible == true)
{
menu_work_report();
}
else if (Pub.setting.startForm == eFormList.)
else if (Pub.setting.startForm == eFormList. && menu_projectVisible == true)
{
menu_projecT_list();
}
else if(Pub.setting.startForm == eFormList. && menu_jagoVisible==true)
{
Menu_Inventory();
}
else if (Pub.setting.startForm == eFormList. && menu_jagoVisible == true)
{
Menu_InventoryList();
}
else if (Pub.setting.startForm == eFormList. && menu_logdata == true)
{
Menu_logData();
}
}
void _SetLang()
{
@@ -254,9 +276,7 @@ namespace Project
private void staffGridToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "STAFFGRID";
if (!ShowForm(formkey))
AddForm(formkey, new _Info.fInfo_Staff());
}
@@ -357,9 +377,7 @@ namespace Project
private void mailFormToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "MAILFORM";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fMailform());
}
@@ -412,7 +430,7 @@ namespace Project
private void toolStripButton2_Click(object sender, EventArgs e)
{
menu_purchase.PerformClick();
mn_purchase.PerformClick();
}
private void userAccountToolStripMenuItem_Click(object sender, EventArgs e)
@@ -624,7 +642,7 @@ namespace Project
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_Inventory();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -708,5 +726,51 @@ namespace Project
f.ShowDialog();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_Inventory();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.Inventory.RepInvStock();
f.ShowDialog();
}
void Menu_InventoryList()
{
string formkey = "INVENTORYLIST";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fInventoryJagoList());
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_InventoryList();
}
private void toolStripMenuItem1_Click(object sender, EventArgs e)
{
string formkey = "STAFFGRID";
if (!ShowForm(formkey))
AddForm(formkey, new _Info.fInfo_Staff());
}
private void toolStripMenuItem3_Click(object sender, EventArgs e)
{
string formkey = "MAILFORM";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fMailform());
}
void Menu_logData()
{
//운영기록
string formkey = "LOGDATA";
if (!ShowForm(formkey))
AddForm(formkey, new FLG0000.LogData.List());
}
private void mn_logdata_Click(object sender, EventArgs e)
{
Menu_logData();
}
}
}

View File

@@ -164,7 +164,18 @@
RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
</value>
</data>
<data name="menu_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_logdata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIUtAFNle4Gt2fX6/pu814yz2Xyet5vN/FpwiWag2eXw+6vU+6TR+1hpf3iatL7e/T6C
uWF8m8Df/Ze3y8Xi/uv1/m+PqrXa/Uhace72/rTZ/LHX/FSRueDp87XN4MDf/vn8/p/A23ygvHaZtnSU
r/D3/rfa/HmbtV13lejy/T13uer0/77a9f///////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAtACwAAAAAEAAQ
AAAIpABZCBxIcGCLgyw2PHiQoqHDhiwOtmAxQIXFixcDREQ4YIXHjx8JbJwoQQUCjBlHspAAsqVGiRRN
WuxQoICJBiNCbKT4EUQBAR8ECCCR4EREFgRk/qQwYUIEBw4wQBBI4GMDARFKZFCgYEGCAwIHEAgQoAIK
Dxq6GjCQAEBBgSJQyEVhwYBbiXhZQDhwAACKBRdG4p04EAAHBoIHwwSAWLFjgwEBADs=
</value>
</data>
<data name="mn_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIwSURBVDhPpVLbSqJRGPVqruY9Zp7gf4F5jbkSEhFE
@@ -180,7 +191,7 @@
AABJRU5ErkJggg==
</value>
</data>
<data name="menu_project.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_project.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4
Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKB
@@ -195,7 +206,7 @@
FDQRoA+IDAJU0JjQWI2cDgY9DBigRMgWBj2WiJEDh2PBNiew7GDwIEYcjggL8hhDgAruiB1/CwwIADs=
</value>
</data>
<data name="menu_dailyhistory.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_dailyhistory.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQAANnq+K7T5HiUsMHb+v/vlOXs9IyzzHWs1/T5/1ZtjUlVa+z1/+3x9uTx/6a2ysng
+FFhe0NLXIDG/fD4/ykxQz5FVf/41vr8/6TI3MvM0XHG/vbHQPn8//b8/4PL/f///yH/C05FVFNDQVBF
@@ -205,7 +216,7 @@
BoA/JHjAoACDx5AfZ6DgNoFlCBAUKIgQoUIFCkMPih4dEAA7
</value>
</data>
<data name="menu_jago.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_jago.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt
Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF
@@ -215,7 +226,7 @@
v3gHemD5QK4HtBMSEyRplOTBgAA7
</value>
</data>
<data name="menu_eq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_eq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIUkAHBwcMXFxaioqJqamtHR0XNzc6SkpJeXl6CgoNXV1ZiYmHd3d8fHx6Kioo2NjZub
m6GhoX9/f4qKipSUlKenp5CQkJOTk6Ojo3t7e6WlpZ2dnX19fZ+fn4SEhHJycn5+foWFhZ6entra2v//
@@ -235,7 +246,7 @@
OoWKdGiDBgEBADs=
</value>
</data>
<data name="boardsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF

View File

@@ -35,8 +35,6 @@
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.chkLogIO = new System.Windows.Forms.CheckBox();
this.bsUser = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.bsModel = new System.Windows.Forms.BindingSource(this.components);
@@ -44,7 +42,6 @@
this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsUser)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsModel)).BeginInit();
@@ -87,7 +84,6 @@
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
@@ -106,26 +102,6 @@
this.tabPage1.Text = "Main";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.chkLogIO);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(931, 442);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "Log";
this.tabPage4.UseVisualStyleBackColor = true;
//
// chkLogIO
//
this.chkLogIO.AutoSize = true;
this.chkLogIO.Location = new System.Drawing.Point(19, 17);
this.chkLogIO.Name = "chkLogIO";
this.chkLogIO.Size = new System.Drawing.Size(164, 24);
this.chkLogIO.TabIndex = 0;
this.chkLogIO.Text = "Advantech I/O Data";
this.chkLogIO.UseVisualStyleBackColor = true;
//
// bsUser
//
this.bsUser.DataMember = "Users";
@@ -161,8 +137,6 @@
this.panel1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsUser)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bsModel)).EndInit();
@@ -179,8 +153,6 @@
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.BindingSource bsUser;
private DataSet1 dataSet1;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.CheckBox chkLogIO;
private System.Windows.Forms.BindingSource bsModel;
private System.Windows.Forms.ToolTip toolTip1;
}

View File

@@ -24,9 +24,6 @@ namespace Project
};
this.MouseMove += (s1, e1) => { if (DateTime.Now > Pub.LastInputTime) Pub.LastInputTime = DateTime.Now; };
this.FormClosed += __Closed;
}
private void __Closed(object sender, FormClosedEventArgs e)
@@ -43,7 +40,7 @@ namespace Project
//this.dataSet1.Merge(Pub.mdm.dataSet);
this.dataSet1.AcceptChanges();
this.chkLogIO.DataBindings.Add(new Binding("Checked", Pub.setting, "Log_IO", false, DataSourceUpdateMode.OnPropertyChanged));
// this.chkLogIO.DataBindings.Add(new Binding("Checked", Pub.setting, "Log_IO", false, DataSourceUpdateMode.OnPropertyChanged));
}