This commit is contained in:
chikyun.kim
2018-10-02 17:33:28 +09:00
parent c49f039d03
commit 340a6fd3ef
26 changed files with 1275 additions and 520 deletions

View File

@@ -151,6 +151,7 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="Equipment\ReportB.rdlc" />
<EmbeddedResource Include="Equipment\ReportE.rdlc" />
@@ -219,7 +220,9 @@
<Name>FCOMMON</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="Resources\action_save.gif" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -8,64 +8,66 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace FEQ0000.Properties
{
namespace FEQ0000.Properties {
using System;
/// <summary>
/// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다.
/// </summary>
// 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder
// 클래스에서 자동으로 생성되었습니다.
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여
// ResGen을 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
// 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
internal Resources() {
}
/// <summary>
/// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FEQ0000.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture
/// 속성을 재정의합니다.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set
{
set {
resourceCulture = value;
}
}
/// <summary>
/// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
/// </summary>
internal static System.Drawing.Bitmap action_save {
get {
object obj = ResourceManager.GetObject("action_save", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: 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">
@@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<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">
@@ -85,9 +87,10 @@
<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" msdata:Ordinal="1" />
<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">
@@ -109,9 +112,13 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="action_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_save.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@@ -40,6 +40,7 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
this.dsPurchase = new FEQ0000.dsPurchase();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -57,33 +58,42 @@
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.btSave = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
this.lbSum = new System.Windows.Forms.ToolStripLabel();
this.dv1 = new System.Windows.Forms.DataGridView();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.dtSD = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.lbEnd = new System.Windows.Forms.ToolStripLabel();
this.dtED = new System.Windows.Forms.ToolStripTextBox();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cmbState = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
this.btSearch = new System.Windows.Forms.ToolStripButton();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pumidx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.supplyidx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -138,22 +148,26 @@
this.bindingNavigatorSeparator2,
this.bindingNavigatorAddNewItem,
this.bindingNavigatorDeleteItem,
this.toolStripButton1});
this.bn.Location = new System.Drawing.Point(0, 515);
this.toolStripButton1,
this.btSave,
this.toolStripSeparator1,
this.toolStripLabel5,
this.lbSum});
this.bn.Location = new System.Drawing.Point(0, 514);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(811, 25);
this.bn.Size = new System.Drawing.Size(811, 26);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 23);
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
//
@@ -162,7 +176,7 @@
this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22);
this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 23);
this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
//
// bindingNavigatorMoveFirstItem
@@ -171,7 +185,7 @@
this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 23);
this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
//
// bindingNavigatorMovePreviousItem
@@ -180,13 +194,13 @@
this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 23);
this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
//
// bindingNavigatorSeparator
//
this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 26);
//
// bindingNavigatorPositionItem
//
@@ -200,7 +214,7 @@
// bindingNavigatorSeparator1
//
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 26);
//
// bindingNavigatorMoveNextItem
//
@@ -208,7 +222,7 @@
this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 23);
this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
//
// bindingNavigatorMoveLastItem
@@ -217,20 +231,20 @@
this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 23);
this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
//
// bindingNavigatorSeparator2
//
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 26);
//
// bindingNavigatorAddNewItem
//
this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22);
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 23);
this.bindingNavigatorAddNewItem.Text = "Add(&A)";
this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
//
@@ -240,10 +254,37 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(122, 22);
this.toolStripButton1.Size = new System.Drawing.Size(122, 23);
this.toolStripButton1.Text = "Report(Summary)";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
//
// btSave
//
this.btSave.Image = global::FEQ0000.Properties.Resources.action_save;
this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(67, 23);
this.btSave.Text = "Save(&S)";
this.btSave.Click += new System.EventHandler(this.btSave_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 26);
//
// toolStripLabel5
//
this.toolStripLabel5.Name = "toolStripLabel5";
this.toolStripLabel5.Size = new System.Drawing.Size(58, 23);
this.toolStripLabel5.Text = "Sub Total";
//
// lbSum
//
this.lbSum.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSum.Name = "lbSum";
this.lbSum.Size = new System.Drawing.Size(22, 23);
this.lbSum.Text = "0";
//
// dv1
//
this.dv1.AllowUserToAddRows = false;
@@ -252,21 +293,22 @@
this.dv1.ColumnHeadersHeight = 30;
this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn1,
this.dataGridViewTextBoxColumn2,
this.dataGridViewTextBoxColumn3,
this.dataGridViewTextBoxColumn4,
this.dataGridViewTextBoxColumn5,
this.dataGridViewTextBoxColumn6,
this.dataGridViewTextBoxColumn7,
this.dataGridViewTextBoxColumn6,
this.dataGridViewTextBoxColumn5,
this.dataGridViewTextBoxColumn8,
this.dataGridViewTextBoxColumn9,
this.pumidx,
this.dataGridViewTextBoxColumn10,
this.dataGridViewTextBoxColumn11,
this.dataGridViewTextBoxColumn12,
this.dataGridViewTextBoxColumn13,
this.dataGridViewTextBoxColumn14,
this.dataGridViewTextBoxColumn15,
this.supplyidx,
this.dataGridViewTextBoxColumn17,
this.dataGridViewTextBoxColumn19,
this.dataGridViewTextBoxColumn20,
@@ -277,19 +319,22 @@
this.dv1.DataSource = this.bs;
this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv1.Location = new System.Drawing.Point(0, 25);
this.dv1.MultiSelect = false;
this.dv1.Name = "dv1";
this.dv1.ReadOnly = true;
this.dv1.RowTemplate.Height = 23;
this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dv1.Size = new System.Drawing.Size(811, 490);
this.dv1.Size = new System.Drawing.Size(811, 489);
this.dv1.TabIndex = 2;
this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick);
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoResizeColumnsToolStripMenuItem});
this.autoResizeColumnsToolStripMenuItem,
this.viewThisUserDataToolStripMenuItem});
this.cm1.Name = "contextMenuStrip1";
this.cm1.Size = new System.Drawing.Size(186, 26);
this.cm1.Size = new System.Drawing.Size(186, 48);
//
// autoResizeColumnsToolStripMenuItem
//
@@ -298,14 +343,24 @@
this.autoResizeColumnsToolStripMenuItem.Text = "AutoResize Columns";
this.autoResizeColumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnsToolStripMenuItem_Click);
//
// viewThisUserDataToolStripMenuItem
//
this.viewThisUserDataToolStripMenuItem.Name = "viewThisUserDataToolStripMenuItem";
this.viewThisUserDataToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
this.viewThisUserDataToolStripMenuItem.Text = "View This User data";
this.viewThisUserDataToolStripMenuItem.Click += new System.EventHandler(this.viewThisUserDataToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.lbStt,
this.dtSD,
this.toolStripLabel4,
this.toolStripLabel2,
this.lbEnd,
this.dtED,
this.toolStripSeparator2,
this.toolStripLabel1,
this.cmbState,
this.toolStripSeparator3,
this.toolStripLabel3,
this.tbRequest,
this.btSearch});
@@ -315,47 +370,69 @@
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel1
// lbStt
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(32, 22);
this.toolStripLabel1.Text = "Start";
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(41, 22);
this.lbStt.Text = "Period";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(100, 25);
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripLabel4
// lbEnd
//
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(15, 22);
this.toolStripLabel4.Text = "~";
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(27, 22);
this.toolStripLabel2.Text = "End";
this.lbEnd.Name = "lbEnd";
this.lbEnd.Size = new System.Drawing.Size(15, 22);
this.lbEnd.Text = "~";
this.lbEnd.Click += new System.EventHandler(this.lbEnd_Click);
//
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(100, 25);
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(34, 22);
this.toolStripLabel1.Text = "State";
//
// cmbState
//
this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbState.Name = "cmbState";
this.cmbState.Size = new System.Drawing.Size(100, 25);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(66, 22);
this.toolStripLabel3.Text = "User Name";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
// tbRequest
//
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbRequest.Name = "tbRequest";
this.tbRequest.Size = new System.Drawing.Size(100, 25);
this.tbRequest.Size = new System.Drawing.Size(70, 25);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown);
//
// btSearch
@@ -367,17 +444,6 @@
this.btSearch.Text = "Refresh(&R)";
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn1.HeaderText = "IDX";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
this.dataGridViewTextBoxColumn1.Width = 50;
//
// dataGridViewTextBoxColumn2
//
this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
@@ -388,9 +454,9 @@
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn3.HeaderText = "State";
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.ReadOnly = true;
@@ -402,38 +468,38 @@
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.ReadOnly = true;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "receive";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3;
this.dataGridViewTextBoxColumn5.HeaderText = "receive";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "sc";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle4;
this.dataGridViewTextBoxColumn6.HeaderText = "sc#";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.ReadOnly = true;
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "request";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridViewTextBoxColumn7.HeaderText = "request";
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
this.dataGridViewTextBoxColumn7.ReadOnly = true;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "sc";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle3;
this.dataGridViewTextBoxColumn6.HeaderText = "sc#";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.ReadOnly = true;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "receive";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4;
this.dataGridViewTextBoxColumn5.HeaderText = "receive";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
//
// dataGridViewTextBoxColumn8
//
this.dataGridViewTextBoxColumn8.DataPropertyName = "sid";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle5;
this.dataGridViewTextBoxColumn8.HeaderText = "sid#";
this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
this.dataGridViewTextBoxColumn8.ReadOnly = true;
@@ -445,6 +511,18 @@
this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
this.dataGridViewTextBoxColumn9.ReadOnly = true;
//
// pumidx
//
this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.pumidx.DataPropertyName = "pumidx";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.pumidx.DefaultCellStyle = dataGridViewCellStyle6;
this.pumidx.HeaderText = "*";
this.pumidx.Name = "pumidx";
this.pumidx.ReadOnly = true;
this.pumidx.Width = 50;
//
// dataGridViewTextBoxColumn10
//
this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale";
@@ -496,6 +574,18 @@
this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
this.dataGridViewTextBoxColumn15.ReadOnly = true;
//
// supplyidx
//
this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.supplyidx.DataPropertyName = "supplyidx";
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.supplyidx.DefaultCellStyle = dataGridViewCellStyle10;
this.supplyidx.HeaderText = "*";
this.supplyidx.Name = "supplyidx";
this.supplyidx.ReadOnly = true;
this.supplyidx.Width = 50;
//
// dataGridViewTextBoxColumn17
//
this.dataGridViewTextBoxColumn17.DataPropertyName = "project";
@@ -527,8 +617,8 @@
// dataGridViewTextBoxColumn22
//
this.dataGridViewTextBoxColumn22.DataPropertyName = "po";
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle11;
this.dataGridViewTextBoxColumn22.HeaderText = "PO";
this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
this.dataGridViewTextBoxColumn22.ReadOnly = true;
@@ -585,10 +675,9 @@
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
private System.Windows.Forms.DataGridView dv1;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripLabel lbStt;
private System.Windows.Forms.ToolStripTextBox dtSD;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripLabel lbEnd;
private System.Windows.Forms.ToolStripTextBox dtED;
private System.Windows.Forms.ToolStripButton btSearch;
private System.Windows.Forms.ContextMenuStrip cm1;
@@ -596,21 +685,31 @@
private System.Windows.Forms.ToolStripLabel toolStripLabel3;
private System.Windows.Forms.ToolStripTextBox tbRequest;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel5;
private System.Windows.Forms.ToolStripLabel lbSum;
private System.Windows.Forms.ToolStripButton btSave;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripComboBox cmbState;
private System.Windows.Forms.ToolStripMenuItem viewThisUserDataToolStripMenuItem;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
private System.Windows.Forms.DataGridViewTextBoxColumn pumidx;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
private System.Windows.Forms.DataGridViewTextBoxColumn supplyidx;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;

View File

@@ -15,6 +15,18 @@ namespace FEQ0000
{
InitializeComponent();
this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow;
if (FCOMMON.info.Login.level > 9)
{
dv1.SelectionMode = DataGridViewSelectionMode.CellSelect;
dv1.EditMode = DataGridViewEditMode.EditOnKeystrokeOrF2;
btSave.Visible = true;
}
else
{
dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
btSave.Visible = false;
}
}
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
@@ -36,10 +48,19 @@ namespace FEQ0000
this.tbRequest.Text = FCOMMON.info.Login.nameK;
this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
//state list
var stList = FCOMMON.DBM.getCodeList("04");
this.cmbState.Items.Clear();
cmbState.Items.Add("-- All --");
foreach (var item in stList)
cmbState.Items.Add(item);
this.cmbState.SelectedIndex = 0;
refreshData();
}
private void purchaseBindingNavigatorSaveItem_Click(object sender, EventArgs e)
private void saveData()
{
this.Validate();
this.bs.EndEdit();
@@ -51,16 +72,27 @@ namespace FEQ0000
{
try
{
string state = "%";
if (cmbState.SelectedIndex > 0) {
state = cmbState.Text.Split(',')[0].Substring(1);
}
string request = "%";
if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%";
this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text,dtED.Text,request);
this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, request, state);
if (!tbRequest.Text.isEmpty()) this.dv1.AutoResizeColumns();
showSummary();
}
catch (System.Exception ex)
{
System.Windows.Forms.MessageBox.Show(ex.Message);
}
}
void showSummary()
{
decimal sum = 0;
foreach (dsPurchase.PurchaseRow dr in this.dsPurchase.Purchase.Rows)
if(!dr.IspumamtNull()) sum += dr.pumamt;
lbSum.Text = sum.ToString("N0");
}
private void btSearch_Click(object sender, EventArgs e)
@@ -103,5 +135,65 @@ namespace FEQ0000
if(e.KeyCode == Keys.Enter)
btSearch.PerformClick();
}
private void btSave_Click(object sender, EventArgs e)
{
saveData();
}
private void dv1_DoubleClick(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPurchase.PurchaseRow;
fPurchase_Add f = new fPurchase_Add(dr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.ta.Update(dr);
dr.AcceptChanges();
}
else dr.RejectChanges();
}
private void lbStt_Click(object sender, EventArgs e)
{
//start date
var list = FCOMMON.DBM.getGroupList("pdate", "purchase","", true);
FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list);
if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dtSD.Text = f.Title;
dtED.Focus();
}
}
private void lbEnd_Click(object sender, EventArgs e)
{
//end date
var list = FCOMMON.DBM.getGroupList("pdate", "purchase", "pdate >= '" + dtSD.Text + "'", true);
FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dtED.Text = f.Title;
btSearch.PerformClick();
}
}
private void toolStripLabel3_Click(object sender, EventArgs e)
{
//사용자목록처리
tbRequest.Text = string.Empty;
btSearch.PerformClick();
}
private void viewThisUserDataToolStripMenuItem_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
if(drv["request"] == null) return;
this.tbRequest.Text = drv["request"].ToString();
btSearch.PerformClick();
}
}
}

View File

@@ -212,6 +212,12 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="pumidx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="supplyidx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>502, 17</value>
</metadata>

View File

@@ -35,7 +35,7 @@ namespace FEQ0000.Purchase
}
void refreshData()
{
this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, "%");
this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, "%","%");
//Set DataSource
Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();

View File

@@ -2132,12 +2132,13 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
FROM Purchase
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR
ISNULL(receive, '') LIKE @request)
ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state)
ORDER BY pdate DESC, idx DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@request", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "DELETE FROM [Purchase] WHERE import = 1";
@@ -2148,7 +2149,7 @@ ORDER BY pdate DESC, idx DESC";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsPurchase.PurchaseDataTable dataTable, string sd, string ed, string request) {
public virtual int Fill(dsPurchase.PurchaseDataTable dataTable, string sd, string ed, string request, string state) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -2168,6 +2169,12 @@ ORDER BY pdate DESC, idx DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request));
}
if ((state == null)) {
throw new global::System.ArgumentNullException("state");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -2179,7 +2186,7 @@ ORDER BY pdate DESC, idx DESC";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsPurchase.PurchaseDataTable GetData(string sd, string ed, string request) {
public virtual dsPurchase.PurchaseDataTable GetData(string sd, string ed, string request, string state) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -2199,6 +2206,12 @@ ORDER BY pdate DESC, idx DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request));
}
if ((state == null)) {
throw new global::System.ArgumentNullException("state");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state));
}
dsPurchase.PurchaseDataTable dataTable = new dsPurchase.PurchaseDataTable();
this.Adapter.Fill(dataTable);
return dataTable;

View File

@@ -104,12 +104,13 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName
FROM Purchase
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR
ISNULL(receive, '') LIKE @request)
ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state)
ORDER BY pdate DESC, idx DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="request" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@request" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="state" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -246,7 +247,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale,
<xs:element name="dsPurchase" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPurchase" msprop:Generator_UserDSName="dsPurchase">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
<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" />