Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

구매복사시 chk1,chk2 초기화 및 EB구매 컬럼의 필터 기능 추가

Browse Source
This commit is contained in:
chi
2024-06-26 13:58:30 +09:00
parent e4f8981491
commit dde60a7fe8
14 changed files with 3719 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Project/Dialog/fLogin.Designer.cs generated
View File

@@ -31,6 +31,11 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin));
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.listView1 = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tabPage2 = new System.Windows.Forms.TabPage();
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.cmbDept = new System.Windows.Forms.ComboBox(); this.cmbDept = new System.Windows.Forms.ComboBox();
@@ -43,6 +48,8 @@
this.btLogin = new System.Windows.Forms.Button(); this.btLogin = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@@ -59,6 +66,7 @@
// panel1 // panel1
// //
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
this.panel1.Controls.Add(this.tabControl1);
this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.cmbDept); this.panel1.Controls.Add(this.cmbDept);
@@ -71,14 +79,63 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(888, 415); this.panel1.Size = new System.Drawing.Size(888, 710);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(16, 303);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(860, 389);
this.tabControl1.TabIndex = 13;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(852, 353);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "FAQ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// listView1
//
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1});
this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(3, 3);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(846, 347);
this.listView1.TabIndex = 13;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
//
// columnHeader1
//
this.columnHeader1.Text = "제목";
this.columnHeader1.Width = 836;
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(852, 363);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "PATCH";
this.tabPage2.UseVisualStyleBackColor = true;
//
// linkLabel1 // linkLabel1
// //
this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(806, 334); this.linkLabel1.Location = new System.Drawing.Point(806, 110);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(70, 23); this.linkLabel1.Size = new System.Drawing.Size(70, 23);
this.linkLabel1.TabIndex = 11; this.linkLabel1.TabIndex = 11;
@@ -91,7 +148,7 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label4.ForeColor = System.Drawing.Color.Teal; this.label4.ForeColor = System.Drawing.Color.Teal;
this.label4.Location = new System.Drawing.Point(13, 342); this.label4.Location = new System.Drawing.Point(13, 267);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(243, 15); this.label4.Size = new System.Drawing.Size(243, 15);
this.label4.TabIndex = 10; this.label4.TabIndex = 10;
@@ -126,7 +183,7 @@
this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha; this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha;
this.tbID.Location = new System.Drawing.Point(16, 213); this.tbID.Location = new System.Drawing.Point(16, 213);
this.tbID.Name = "tbID"; this.tbID.Name = "tbID";
this.tbID.Size = new System.Drawing.Size(860, 41); this.tbID.Size = new System.Drawing.Size(364, 41);
this.tbID.TabIndex = 3; this.tbID.TabIndex = 3;
// //
// label2 // label2
@@ -134,7 +191,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label2.ForeColor = System.Drawing.Color.Gray; this.label2.ForeColor = System.Drawing.Color.Gray;
this.label2.Location = new System.Drawing.Point(13, 269); this.label2.Location = new System.Drawing.Point(509, 195);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 15); this.label2.Size = new System.Drawing.Size(31, 15);
this.label2.TabIndex = 4; this.label2.TabIndex = 4;
@@ -155,10 +212,10 @@
// //
this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha; this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha;
this.tbPW.Location = new System.Drawing.Point(16, 287); this.tbPW.Location = new System.Drawing.Point(512, 213);
this.tbPW.Name = "tbPW"; this.tbPW.Name = "tbPW";
this.tbPW.PasswordChar = '●'; this.tbPW.PasswordChar = '●';
this.tbPW.Size = new System.Drawing.Size(860, 40); this.tbPW.Size = new System.Drawing.Size(364, 40);
this.tbPW.TabIndex = 5; this.tbPW.TabIndex = 5;
this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
// //
@@ -167,7 +224,7 @@
this.panel2.BackColor = System.Drawing.SystemColors.Control; this.panel2.BackColor = System.Drawing.SystemColors.Control;
this.panel2.Controls.Add(this.btLogin); this.panel2.Controls.Add(this.btLogin);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(0, 415); this.panel2.Location = new System.Drawing.Point(0, 710);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(888, 105); this.panel2.Size = new System.Drawing.Size(888, 105);
this.panel2.TabIndex = 6; this.panel2.TabIndex = 6;
@@ -188,19 +245,21 @@
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.OrangeRed; this.BackColor = System.Drawing.Color.OrangeRed;
this.ClientSize = new System.Drawing.Size(888, 520); this.ClientSize = new System.Drawing.Size(888, 815);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2); this.Controls.Add(this.panel2);
this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "fLogin"; this.Name = "fLogin";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "사용자확인"; this.Text = "사용자확인";
this.Load += new System.EventHandler(this.fLogin_Load); this.Load += new System.EventHandler(this.fLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
@@ -220,5 +279,10 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.TabPage tabPage2;
} }
} }

2
Project/Dialog/fLogin.cs
View File

@@ -28,7 +28,7 @@ namespace Project.Dialog
} }
private void fLogin_Load(object sender, EventArgs e) private void fLogin_Load(object sender, EventArgs e)
{ {
EnsureVisibleAndUsableSize(); //EnsureVisibleAndUsableSize();
var list = Pub.setting.lastid.Split(';'); var list = Pub.setting.lastid.Split(';');
foreach (var item in list) foreach (var item in list)
if (item != "") tbID.Items.Add(item); if (item != "") tbID.Items.Add(item);

4
Project/Properties/AssemblyInfo.cs
View File

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

2
Project/Properties/Settings.Designer.cs generated
View File

@@ -12,7 +12,7 @@ namespace Project.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

4
Project/Properties/Settings.settings
View File

@@ -4,7 +4,7 @@
<Settings> <Settings>
<Setting Name="gwcs" Type="(Connection string)" Scope="Application"> <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt; <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt; &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt; &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue> &lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -12,7 +12,7 @@
</Setting> </Setting>
<Setting Name="CS" Type="(Connection string)" Scope="Application"> <Setting Name="CS" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt; <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt; &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt; &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue> &lt;/SerializableConnectionString&gt;</DesignTimeValue>

4519
Project/dsMSSQL.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

608
Project/dsMSSQL.xsd
View File

File diff suppressed because it is too large Load Diff

29
Project/dsMSSQL.xss
View File

@@ -4,21 +4,22 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-9" ViewPortY="28" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:Users" ZOrder="6" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" /> <Shape ID="DesignTable:Users" ZOrder="7" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="13" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" /> <Shape ID="DesignTable:Projects" ZOrder="14" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="9" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" /> <Shape ID="DesignTable:Items" ZOrder="10" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="12" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" /> <Shape ID="DesignTable:Inventory" ZOrder="13" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:LineCode" ZOrder="7" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" /> <Shape ID="DesignTable:LineCode" ZOrder="8" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
<Shape ID="DesignTable:UserGroup" ZOrder="10" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" /> <Shape ID="DesignTable:UserGroup" ZOrder="11" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:SPMaster" ZOrder="5" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:SPMaster" ZOrder="6" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="8" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:EETGW_GroupUser" ZOrder="9" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="3" X="938" Y="-5" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:vGroupUser" ZOrder="4" X="938" Y="-5" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="4" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:JobReport" ZOrder="5" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="11" X="673" Y="48" Height="220" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" /> <Shape ID="DesignTable:MailData" ZOrder="3" X="0" Y="0" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailData" ZOrder="2" X="0" Y="0" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:MailAuto" ZOrder="2" X="168" Y="0" Height="324" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailAuto" ZOrder="1" X="168" Y="0" Height="324" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="12" X="673" Y="48" Height="220" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:BoardFAQ" ZOrder="1" X="73" Y="615" Height="305" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes> </Shapes>
<Connectors /> <Connectors />
</DiagramLayout> </DiagramLayout>

2
SubProject/FCOMMON/Util_Form.cs
View File

@@ -140,7 +140,7 @@ namespace FCOMMON
int t = 0; int t = 0;
if (!int.TryParse(leftStr, out l)) l = 0; if (!int.TryParse(leftStr, out l)) l = 0;
if (!int.TryParse(topStr, out t)) t = 0; if (!int.TryParse(topStr, out t)) t = 0;
if (l != 0 || t != 0) if (f.StartPosition != FormStartPosition.CenterScreen && (l != 0 || t != 0))
{ {
if (l > (maxWidth - 10)) l = 0; if (l > (maxWidth - 10)) l = 0;
if (t >= (maxHeigh - 10)) t = 0; if (t >= (maxHeigh - 10)) t = 0;

9
SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
View File

@@ -126,7 +126,7 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --"); cmbState.Items.Add("-- 전체 --");
foreach (var item in stList) foreach (var item in stList)
cmbState.Items.Add(item.Value); cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received"); cmbState.Items.Add("<Received");
this.cmbState.SelectedIndex = 0; //all기본 - 양진원 this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1; //this.cmbCr.SelectedIndex = 1;
@@ -223,7 +223,7 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0) if (cmbState.SelectedIndex != 0)
{ {
if (cmbState.Text.ToUpper() == "<=RECEIVED") if (cmbState.Text.ToUpper() == "<RECEIVED")
{ {
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')"; cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
} }
@@ -1019,7 +1019,10 @@ namespace FEQ0000
newdr.po = string.Empty; newdr.po = string.Empty;
newdr.indate = string.Empty; newdr.indate = string.Empty;
newdr.edate = string.Empty; newdr.edate = string.Empty;
newdr.pumqty = 0; //실구매수량은 제거 newdr.chk1 = false;
newdr.chk2 = false;
newdr.SetpumqtyNull();
//newdr.pumqty = 0; //실구매수량은 제거
newdr.idx = -1; newdr.idx = -1;
newdr.EndEdit(); newdr.EndEdit();

3
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs generated
View File

@@ -1150,12 +1150,14 @@
this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo";
this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정";
this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -1172,6 +1174,7 @@
this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty";
this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po";
this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;

12
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs
View File

@@ -122,7 +122,8 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --"); cmbState.Items.Add("-- 전체 --");
foreach (var item in stList) foreach (var item in stList)
cmbState.Items.Add(item.Value); cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received"); cmbState.Items.Add("<Received");
//cmbState.Items.Add("App+PR+PO");
this.cmbState.SelectedIndex = 0; this.cmbState.SelectedIndex = 0;
//all기본 - 양진원 //all기본 - 양진원
@@ -202,10 +203,14 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0) if (cmbState.SelectedIndex != 0)
{ {
if (cmbState.Text.ToUpper() == "<=RECEIVED") if (cmbState.Text.ToUpper() == "<RECEIVED")
{ {
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')"; cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
} }
//else if(cmbState.Text.ToUpper() == "APP+PR+PO")
//{
// cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
//}
else else
{ {
cmd.CommandText += " and isnull([state],'') like @st"; cmd.CommandText += " and isnull([state],'') like @st";
@@ -787,6 +792,9 @@ namespace FEQ0000
newdr.indate = string.Empty; newdr.indate = string.Empty;
newdr.edate = string.Empty; newdr.edate = string.Empty;
newdr.pumqty = 0; //실구매수량은 제거 newdr.pumqty = 0; //실구매수량은 제거
newdr.chk2 = false;
newdr.chk1 = false;
newdr.SetpumqtyNull();
newdr.idx = -1; newdr.idx = -1;
newdr.EndEdit(); newdr.EndEdit();

50
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs generated
View File

@@ -158,9 +158,9 @@
this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -937,30 +937,6 @@
this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted); this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted);
this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
// //
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 639);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1334, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 616);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1334, 23);
this.label2.TabIndex = 7;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fpSpread1_Sheet1 // fpSpread1_Sheet1
// //
this.fpSpread1_Sheet1.Reset(); this.fpSpread1_Sheet1.Reset();
@@ -1325,6 +1301,30 @@
this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
// //
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 639);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1334, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 616);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1334, 23);
this.label2.TabIndex = 7;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fPurchaseNR // fPurchaseNR
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

7
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs
View File

@@ -126,7 +126,7 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --"); cmbState.Items.Add("-- 전체 --");
foreach (var item in stList) foreach (var item in stList)
cmbState.Items.Add(item.Value); cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received"); cmbState.Items.Add("<Received");
this.cmbState.SelectedIndex = 0; //all기본 - 양진원 this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1; //this.cmbCr.SelectedIndex = 1;
@@ -253,7 +253,7 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0) if (cmbState.SelectedIndex != 0)
{ {
if (cmbState.Text.ToUpper() == "<=RECEIVED") if (cmbState.Text.ToUpper() == "<RECEIVED")
{ {
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')"; cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
} }
@@ -847,6 +847,9 @@ namespace FEQ0000
newdr.po = string.Empty; newdr.po = string.Empty;
newdr.indate = string.Empty; newdr.indate = string.Empty;
newdr.edate = string.Empty; newdr.edate = string.Empty;
newdr.chk1 = false;
newdr.chk2 = false;
newdr.SetpumqtyNull();
newdr.pumqty = 0; //실구매수량은 제거 newdr.pumqty = 0; //실구매수량은 제거
newdr.idx = -1; newdr.idx = -1;
newdr.EndEdit(); newdr.EndEdit();