This commit is contained in:
chikyun.kim
2019-07-26 17:28:19 +09:00
parent ae209e00af
commit 11d7c7f704
58 changed files with 3360 additions and 6285 deletions

View File

@@ -31,12 +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.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.tbID = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
this.cmbDept = new System.Windows.Forms.ComboBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
@@ -45,7 +48,7 @@
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(136, 34);
this.pictureBox1.Location = new System.Drawing.Point(205, 26);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(80, 80);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -55,6 +58,9 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
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);
@@ -63,39 +69,48 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(358, 272);
this.panel1.Size = new System.Drawing.Size(488, 366);
this.panel1.TabIndex = 0;
//
// tbID
//
this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F);
this.tbID.FormattingEnabled = true;
this.tbID.Location = new System.Drawing.Point(15, 217);
this.tbID.Name = "tbID";
this.tbID.Size = new System.Drawing.Size(460, 41);
this.tbID.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label2.ForeColor = System.Drawing.Color.Gray;
this.label2.Location = new System.Drawing.Point(12, 200);
this.label2.Location = new System.Drawing.Point(12, 272);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(59, 14);
this.label2.TabIndex = 2;
this.label2.Text = "Password";
this.label2.Size = new System.Drawing.Size(31, 15);
this.label2.TabIndex = 4;
this.label2.Text = "암호";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.Gray;
this.label1.Location = new System.Drawing.Point(12, 131);
this.label1.Location = new System.Drawing.Point(12, 200);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(70, 14);
this.label1.TabIndex = 0;
this.label1.Text = "No or Email";
this.label1.Size = new System.Drawing.Size(55, 15);
this.label1.TabIndex = 2;
this.label1.Text = "사원번호";
//
// tbPW
//
this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbPW.Location = new System.Drawing.Point(15, 219);
this.tbPW.Location = new System.Drawing.Point(15, 291);
this.tbPW.Name = "tbPW";
this.tbPW.PasswordChar = '●';
this.tbPW.Size = new System.Drawing.Size(329, 40);
this.tbPW.TabIndex = 3;
this.tbPW.Size = new System.Drawing.Size(460, 40);
this.tbPW.TabIndex = 5;
this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// panel2
@@ -103,9 +118,9 @@
this.panel2.BackColor = System.Drawing.SystemColors.Control;
this.panel2.Controls.Add(this.btLogin);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(0, 272);
this.panel2.Location = new System.Drawing.Point(0, 366);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(358, 34);
this.panel2.Size = new System.Drawing.Size(488, 34);
this.panel2.TabIndex = 6;
//
// btLogin
@@ -113,26 +128,50 @@
this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill;
this.btLogin.Location = new System.Drawing.Point(0, 0);
this.btLogin.Name = "btLogin";
this.btLogin.Size = new System.Drawing.Size(358, 34);
this.btLogin.Size = new System.Drawing.Size(488, 34);
this.btLogin.TabIndex = 0;
this.btLogin.Text = "LOGIN";
this.btLogin.Text = "접속";
this.btLogin.UseVisualStyleBackColor = true;
this.btLogin.Click += new System.EventHandler(this.button1_Click);
//
// tbID
// label3
//
this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F);
this.tbID.FormattingEnabled = true;
this.tbID.Location = new System.Drawing.Point(15, 148);
this.tbID.Name = "tbID";
this.tbID.Size = new System.Drawing.Size(329, 41);
this.tbID.TabIndex = 1;
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);
//
// fLogin
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.OrangeRed;
this.ClientSize = new System.Drawing.Size(358, 306);
this.ClientSize = new System.Drawing.Size(488, 400);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -140,7 +179,7 @@
this.MinimizeBox = false;
this.Name = "fLogin";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Login";
this.Text = "사용자확인";
this.Load += new System.EventHandler(this.fLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false);
@@ -160,5 +199,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;
}
}

View File

@@ -28,6 +28,11 @@ namespace Project.Dialog
if (item != "") tbID.Items.Add(item);
if (tbID.Items.Count > 0) tbID.SelectedIndex = 0;
var dlist = Pub.setting.lastdept.Split(';');
foreach (var item in dlist)
if (item != "") this.cmbDept.Items.Add(item);
if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0;
this.Show();
Application.DoEvents();
@@ -53,12 +58,22 @@ namespace Project.Dialog
foreach (var item in this.tbID.Items)
if (idlist.Contains(item) == false) idlist.Add(item.ToString());
//180605
var userlist = "";
foreach (var item in idlist)
userlist += ";" + item;
List<string> deptlist = new List<string>();
deptlist.Add(cmbDept.Text.Trim());
foreach (var item in this.cmbDept.Items)
if (deptlist.Contains(item) == false) deptlist.Add(item.ToString());
Pub.setting.lastid = userlist;// tbID.Text.Trim();
//180605
var vuserlist = "";
foreach (var item in idlist)
vuserlist += ";" + item;
var vdeptlist = "";
foreach(var item in deptlist)
vdeptlist += ";" + item;
Pub.setting.lastid = vuserlist;// tbID.Text.Trim();
Pub.setting.lastdept = vdeptlist;
Pub.setting.Save();
var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim());
@@ -68,27 +83,32 @@ namespace Project.Dialog
var users = ta.GetIDPW(encpass, tbID.Text.Trim());
if (users.Rows.Count < 1)
{
Util.MsgE("No user");
Util.MsgE("입력한 사용자 계정이 존재하지 않습니다");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else
{
//이사용자의 부서 코드확인
var userdr = users.Rows[0] as dsMSSQL.UsersRow;
if(userdr.level < 9 && userdr.dept != cmbDept.Text)
{
Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
return;
}
FCOMMON.info.Login.no = userdr.id;
FCOMMON.info.Login.nameK = userdr.name;
FCOMMON.info.Login.dept = userdr.dept;
FCOMMON.info.Login.dept = cmbDept.Text;
FCOMMON.info.Login.level = userdr.level;
FCOMMON.info.Login.email = userdr.email;
FCOMMON.info.Login.nameE = userdr.nameE;
FCOMMON.info.Login.hp = userdr.hp;
FCOMMON.info.Login.tel = userdr.tel;
FCOMMON.info.Login.title = userdr.ads_title;
var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + userdr.dept + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + userdr.dept + "'");
var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gcode;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse( gperm);
@@ -102,6 +122,20 @@ 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)
{
var f = new Dialog.fSelectDept();
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
if (cmbDept.Items.Contains(f.deptName) == false)
cmbDept.Items.Add(f.deptName);
cmbDept.Text = f.deptName;
}
}
}
}

View File

@@ -124,6 +124,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\ArSetting.Net4.dll</HintPath>
</Reference>
<Reference Include="FarPoint.Localization, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL" />
<Reference Include="FarPoint.Win, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL" />
<Reference Include="FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL" />
<Reference Include="GrapeCity.Win.PluginInputMan, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL" />
<Reference Include="libxl.net">
<HintPath>..\DLL\libxl.net.dll</HintPath>
</Reference>
@@ -200,6 +204,12 @@
<Compile Include="Dialog\fErrorException.Designer.cs">
<DependentUpon>fErrorException.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fSelectDept.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fSelectDept.Designer.cs">
<DependentUpon>fSelectDept.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fTouchKeyFull.cs">
<SubType>Form</SubType>
</Compile>
@@ -303,6 +313,9 @@
<EmbeddedResource Include="Dialog\fErrorException.resx">
<DependentUpon>fErrorException.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fSelectDept.resx">
<DependentUpon>fSelectDept.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fTouchKeyFull.resx">
<DependentUpon>fTouchKeyFull.cs</DependentUpon>
</EmbeddedResource>

View File

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

View File

@@ -0,0 +1 @@
FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457

View File

@@ -46,7 +46,10 @@ namespace Project
[Category("Barcode"), DisplayName("Port Name")]
public string Barcode { get; set; }
[Browsable(false)]
public string lastid { get; set; }
[Browsable(false)]
public string lastdept { get; set; }
public int CamIndex { get; set; }
public Setting() : this(Util.CurrentPath + "setting.xml") {}
@@ -68,6 +71,7 @@ namespace Project
if (Language.isEmpty()) Language = "Kor";
if (Password_Setup.isEmpty()) Password_Setup = "0000";
if (Password_User.isEmpty()) Password_User = "9999";
if (lastdept == "") lastdept = "제조본부 장비기술팀 K4장비기술1파트";
//시작폼가져오기
var = Xml.get_Data("startForm");

File diff suppressed because it is too large Load Diff

View File

@@ -686,6 +686,79 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="UserGroupTableAdapter" GeneratorDataComponentClassName="UserGroupTableAdapter" Name="UserGroup" UserDataComponentName="UserGroupTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.UserGroup" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_path_kj" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_path_kj" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_advpurchase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_advpurchase" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [advpurchase], [permission]) VALUES (@dept, @gcode, @path_kj, @advpurchase, @permission);
SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@path_kj" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@advpurchase" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT dept, gcode, path_kj, advpurchase, permission
FROM UserGroup
WHERE (ISNULL(gcode, '') &lt;&gt; '') AND (ISNULL(permission, 0) &gt; 0)</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [advpurchase] = @advpurchase, [permission] = @permission WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)));
SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@path_kj" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@advpurchase" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_path_kj" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_path_kj" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="path_kj" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_advpurchase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_advpurchase" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advpurchase" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_permission" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="permission" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="dept" DataSetColumn="dept" />
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="path_kj" DataSetColumn="path_kj" />
<Mapping SourceColumn="advpurchase" DataSetColumn="advpurchase" />
<Mapping SourceColumn="permission" DataSetColumn="permission" />
</Mappings>
<Sources />
</TableAdapter>
</Tables>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="GetItemName" MethodsParameterType="CLR" Modifier="Public" Name="GetItemName" QueryType="Scalar" ScalarCallRetval="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GetItemName">
@@ -719,7 +792,7 @@ WHERE (idx = @idx)</CommandText>
<xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -846,7 +919,7 @@ WHERE (idx = @idx)</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -917,7 +990,7 @@ WHERE (idx = @idx)</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -975,7 +1048,7 @@ WHERE (idx = @idx)</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowEvArgName="InventoryRowChangeEvent">
<xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_RowClassName="InventoryRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1045,7 +1118,7 @@ WHERE (idx = @idx)</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_RowClassName="LineCodeRow" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent">
<xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent" msprop:Generator_RowClassName="LineCodeRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1089,6 +1162,35 @@ WHERE (idx = @idx)</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_RowClassName="UserGroupRow">
<xs:complexType>
<xs:sequence>
<xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="path_kj" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="path_kj" msprop:Generator_ColumnVarNameInTable="columnpath_kj" msprop:Generator_ColumnPropNameInTable="path_kjColumn" msprop:Generator_UserColumnName="path_kj" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="advpurchase" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="advpurchase" msprop:Generator_ColumnVarNameInTable="columnadvpurchase" msprop:Generator_ColumnPropNameInTable="advpurchaseColumn" msprop:Generator_UserColumnName="advpurchase" type="xs:boolean" minOccurs="0" />
<xs:element name="permission" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="permission" msprop:Generator_ColumnVarNameInTable="columnpermission" msprop:Generator_ColumnPropNameInTable="permissionColumn" msprop:Generator_UserColumnName="permission" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -1111,5 +1213,9 @@ WHERE (idx = @idx)</CommandText>
<xs:selector xpath=".//mstns:LineCode" />
<xs:field xpath="mstns:idx" />
</xs:unique>
<xs:unique name="UserGroup_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:UserGroup" />
<xs:field xpath="mstns:dept" />
</xs:unique>
</xs:element>
</xs:schema>

View File

@@ -6,7 +6,7 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Users" ZOrder="1" X="21" Y="11" Height="554" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Users" ZOrder="1" X="21" Y="11" Height="554" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="6" X="252" Y="-11" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="5" X="245" Y="160" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="4" X="481" Y="47" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />

View File

@@ -40,7 +40,6 @@
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.sbRedis = new System.Windows.Forms.ToolStripStatusLabel();
this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel();
this.btLog = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.btSetting = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -50,6 +49,7 @@
this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
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();
@@ -59,13 +59,13 @@
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.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menu_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.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -89,12 +89,9 @@
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.SuspendLayout();
//
// tmDisplay
@@ -158,21 +155,11 @@
this.sbLogin.Size = new System.Drawing.Size(50, 17);
this.sbLogin.Text = "{LOGIN}";
//
// btLog
//
this.btLog.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.btLog.ForeColor = System.Drawing.Color.DimGray;
this.btLog.Name = "btLog";
this.btLog.Size = new System.Drawing.Size(105, 23);
this.btLog.Text = "프로그램기록";
this.btLog.Click += new System.EventHandler(this.logToolStripMenuItem_Click);
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btSetting,
this.btLog,
this.ToolStripMenuItem,
this.commonToolStripMenuItem,
this.managementToolStripMenuItem,
@@ -255,6 +242,13 @@
this.myAccouserToolStripMenuItem.Text = "계정목록";
this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_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);
//
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
@@ -331,15 +325,6 @@
this.menu_jago.Text = "품목재고";
this.menu_jago.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// personalInventoryToolStripMenuItem
//
this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.personalInventoryToolStripMenuItem.Text = "개인별 물품";
this.personalInventoryToolStripMenuItem.Visible = false;
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// menu_eq
//
this.menu_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -386,6 +371,15 @@
this.ToolStripMenuItem.Text = "라인코드관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// personalInventoryToolStripMenuItem
//
this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.personalInventoryToolStripMenuItem.Text = "개인별 물품";
this.personalInventoryToolStripMenuItem.Visible = false;
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// boardsToolStripMenuItem
//
this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -570,7 +564,6 @@
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tabControl1.Location = new System.Drawing.Point(1, 28);
@@ -583,25 +576,6 @@
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
// tabPage1
//
this.tabPage1.BackColor = System.Drawing.Color.LightGray;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.tabPage1.ContextMenuStrip = this.cmTab;
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
this.tabPage1.Size = new System.Drawing.Size(1026, 561);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "요약";
//
// 권한설정ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "권한설정ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.ToolStripMenuItem.Text = "권한설정";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -624,7 +598,6 @@
this.statusStrip1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -641,7 +614,6 @@
private System.Windows.Forms.ToolStripStatusLabel sbBCD;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripMenuItem btSetting;
private System.Windows.Forms.ToolStripMenuItem btLog;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem commonToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem;
@@ -673,7 +645,6 @@
private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;

View File

@@ -19,7 +19,7 @@ namespace Project
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.F12) btSetting.PerformClick();
else if (e1.KeyCode == Keys.F11) btLog.PerformClick();
//else if (e1.KeyCode == Keys.F11) btLog.PerformClick();
else if (e1.KeyCode == Keys.F1 && e1.Control && e1.Shift)
{
Dialog.fDebug f = new Dialog.fDebug();
@@ -156,7 +156,7 @@ namespace Project
void _SetLang()
{
btSetting.Text = Lang.Setting;
//btSetting.Text = Lang.Setting;
}
void barcode_ReceiveData(object sender, Device.Barcode.ReceiveDataEventArgs e)
@@ -378,13 +378,11 @@ namespace Project
void menu_nrpurchase()
{
string formkey = "PUCHASE";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fPurchase());
}
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_nrpurchase();
@@ -472,16 +470,34 @@ namespace Project
f.Dock = DockStyle.Fill;
f.ControlBox = false;
f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
f.FormClosed += f_FormClosed;
f.Tag = key;
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;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Tag = key;
this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1;
f.Show();
}
void f_FormClosed(object sender, FormClosedEventArgs e)
{
var f = sender as Form;
var key = f.Tag.ToString();
foreach(TabPage tab in this.tabControl1.TabPages)
{
if (tab.Visible == true)
{
this.tabControl1.TabPages.Remove(tab);
break;
}
}
if (this.tabControl1.TabPages.Count > 0) this.tabControl1.SelectedIndex = this.tabControl1.TabCount - 1;
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
_Management.fLineCode f = new _Management.fLineCode();
@@ -550,18 +566,16 @@ namespace Project
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (this.tabControl1.TabPages.Count > 1)
while (tabControl1.TabPages.Count > 0)
{
while (tabControl1.TabPages.Count > 1)
{
var tab = this.tabControl1.TabPages[1];
var f = tab.Controls[0] as System.Windows.Forms.Form;
f.Close();
f.Dispose();
tabControl1.TabPages.Remove(tab);
this.tabControl1.Refresh();
}
var tab = this.tabControl1.TabPages[0];
var f = tab.Controls[0] as System.Windows.Forms.Form;
f.Close();
f.Dispose();
tabControl1.TabPages.Remove(tab);
this.tabControl1.Refresh();
}
Func_Login();
}

View File

@@ -162,34 +162,6 @@
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
</value>
</data>
<data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
OoWKdGiDBgEBADs=
</value>
</data>
<data name="boardsToolStripMenuItem.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
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
</value>
</data>
<data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
/yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
Ow==
</value>
</data>
<data name="menu_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -252,6 +224,34 @@
AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v
LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL
hQnTql2rNiAAOw==
</value>
</data>
<data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
OoWKdGiDBgEBADs=
</value>
</data>
<data name="boardsToolStripMenuItem.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
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
</value>
</data>
<data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
/yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
Ow==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">