the reciving search box is oworking

This commit is contained in:
Bobbie Hodgetts
2024-05-10 22:42:14 +01:00
parent c2082acf8e
commit 960579b0b2
9 changed files with 260 additions and 21 deletions

View File

@@ -0,0 +1,91 @@
using FikaAmazonAPI.AmazonSpApiSDK.Models.ProductFees;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.ComponentModel.Design.ObjectSelectorEditor;
namespace bnhtrade.Core.Data.Database.Account
{
internal class PurchaseInvoiceLineSummary : Connection
{
public List<Model.Account.PurchaseInvoiceLineSummary> Read(DateTime periodTo, string lineStatus, List<string> descriptionSearch)
{
var returnList = new List<Model.Account.PurchaseInvoiceLineSummary>();
var sqlBuilder = new bnhtrade.Core.Data.Database.SqlWhereBuilder();
//build sql query
string sql = @"
SELECT tblPurchase.PurchaseDate
,tblPurchase.PurchaseID
,tblPurchase.PurchaseNumber
,tblPurchaseLine.PurchaseLineID
,tblPurchaseLine.ItemDescription
,tblPurchaseLineStatus.PurchaseLineStatus
FROM tblPurchase
INNER JOIN tblPurchaseLine ON tblPurchase.PurchaseID = tblPurchaseLine.PurchaseID
INNER JOIN tblPurchaseLineStatus ON tblPurchaseLine.PurchaseLineStatusID = tblPurchaseLineStatus.PurchaseLineStatusID
WHERE tblPurchase.PurchaseDate <= @purchaseDate
";
if (lineStatus != null)
{
sql = sql + " AND PurchaseLineStatus = @purchaseLineStatus ";
}
// build the where statments
if (descriptionSearch.Any())
{
sqlBuilder.LikeAnd("ItemDescription", descriptionSearch, "AND");
}
// append where string to the sql
if (sqlBuilder.IsSetSqlWhereString)
{
sql = sql + sqlBuilder.SqlWhereString;
}
using (SqlConnection conn = new SqlConnection(SqlConnectionString))
{
conn.Open();
using (SqlCommand cmd = new SqlCommand(sql, conn))
{
cmd.Parameters.AddWithValue("@purchaseDate", periodTo);
if (descriptionSearch.Any())
{
cmd.Parameters.AddWithValue("@purchaseLineStatus", lineStatus);
}
sqlBuilder.AddParametersToSqlCommand(cmd);
using (SqlDataReader reader = cmd.ExecuteReader())
{
while (reader.Read())
{
DateTime purchaseDate = DateTime.SpecifyKind(reader.GetDateTime(0), DateTimeKind.Utc);
int purchaseID = reader.GetInt32(1);
int purchaseNumber = reader.GetInt32(2);
int purchaseLineID = reader.GetInt32(3);
string itemDescription = reader.GetString(4);
string purchaseLineStatus = reader.GetString(5);
var item = new Model.Account.PurchaseInvoiceLineSummary();
item.PurchaseDate = purchaseDate;
item.PurchaseId = purchaseID;
item.PurchaseNumber = purchaseNumber;
item.PurchaseLineId = purchaseLineID;
item.ItemDescription = itemDescription;
item.LineStatus = purchaseLineStatus;
returnList.Add(item);
}
}
}
}
return returnList;
}
}
}

View File

@@ -12,5 +12,10 @@ namespace bnhtrade.Core.Logic.Account
{ {
return new Data.Database.Account.PurchaseInvoiceLineStatus().Read().Values.ToList(); return new Data.Database.Account.PurchaseInvoiceLineStatus().Read().Values.ToList();
} }
public List<Model.Account.PurchaseInvoiceLineSummary> GetLineSummary(DateTime maxDate, string lineStatus, List<string> wordSearchList)
{
return new Data.Database.Account.PurchaseInvoiceLineSummary().Read(maxDate,lineStatus, wordSearchList);
}
} }
} }

View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace bnhtrade.Core.Model.Account
{
public class PurchaseInvoiceLineSummary
{
public int PurchaseId { get; set; }
public int PurchaseNumber { get; set; }
public int PurchaseLineId { get; set; }
public DateTime PurchaseDate { get; set; }
public string ItemDescription { get; set; }
public string LineStatus { get; set; }
}
}

View File

@@ -33,13 +33,24 @@
tabPage1 = new TabPage(); tabPage1 = new TabPage();
tabPage2 = new TabPage(); tabPage2 = new TabPage();
Receiving = new TabPage(); Receiving = new TabPage();
dataGridView1 = new DataGridView();
bindingSource1 = new BindingSource(components);
buttonSearch = new Button();
comboBox1 = new ComboBox(); comboBox1 = new ComboBox();
purchaseLineStatusBindingSource = new BindingSource(components); purchaseLineStatusBindingSource = new BindingSource(components);
dtTmOrderSearch = new DateTimePicker(); dateTimeOrderSearch = new DateTimePicker();
label1 = new Label(); label1 = new Label();
txtbxOrderSearch = new TextBox(); textboxOrderSearch = new TextBox();
purchaseNumberDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
purchaseDateDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
itemDescriptionDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
purchaseLineIdDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
lineStatusDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
purchaseIdDataGridViewTextBoxColumn = new DataGridViewTextBoxColumn();
tabControl1.SuspendLayout(); tabControl1.SuspendLayout();
Receiving.SuspendLayout(); Receiving.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
((System.ComponentModel.ISupportInitialize)purchaseLineStatusBindingSource).BeginInit(); ((System.ComponentModel.ISupportInitialize)purchaseLineStatusBindingSource).BeginInit();
SuspendLayout(); SuspendLayout();
// //
@@ -79,10 +90,12 @@
// //
// Receiving // Receiving
// //
Receiving.Controls.Add(dataGridView1);
Receiving.Controls.Add(buttonSearch);
Receiving.Controls.Add(comboBox1); Receiving.Controls.Add(comboBox1);
Receiving.Controls.Add(dtTmOrderSearch); Receiving.Controls.Add(dateTimeOrderSearch);
Receiving.Controls.Add(label1); Receiving.Controls.Add(label1);
Receiving.Controls.Add(txtbxOrderSearch); Receiving.Controls.Add(textboxOrderSearch);
Receiving.Location = new Point(4, 24); Receiving.Location = new Point(4, 24);
Receiving.Name = "Receiving"; Receiving.Name = "Receiving";
Receiving.Padding = new Padding(3); Receiving.Padding = new Padding(3);
@@ -92,14 +105,39 @@
Receiving.UseVisualStyleBackColor = true; Receiving.UseVisualStyleBackColor = true;
Receiving.Click += tabPage3_Click; Receiving.Click += tabPage3_Click;
// //
// dataGridView1
//
dataGridView1.AutoGenerateColumns = false;
dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView1.Columns.AddRange(new DataGridViewColumn[] { purchaseNumberDataGridViewTextBoxColumn, purchaseDateDataGridViewTextBoxColumn, itemDescriptionDataGridViewTextBoxColumn, purchaseLineIdDataGridViewTextBoxColumn, lineStatusDataGridViewTextBoxColumn, purchaseIdDataGridViewTextBoxColumn });
dataGridView1.DataSource = bindingSource1;
dataGridView1.Location = new Point(31, 94);
dataGridView1.Name = "dataGridView1";
dataGridView1.Size = new Size(925, 396);
dataGridView1.TabIndex = 5;
//
// bindingSource1
//
bindingSource1.DataSource = typeof(Core.Model.Account.PurchaseInvoiceLineSummary);
//
// buttonSearch
//
buttonSearch.Location = new Point(847, 46);
buttonSearch.Name = "buttonSearch";
buttonSearch.Size = new Size(109, 25);
buttonSearch.TabIndex = 4;
buttonSearch.Text = "Search";
buttonSearch.UseVisualStyleBackColor = true;
buttonSearch.Click += buttonSearch_Click;
//
// comboBox1 // comboBox1
// //
comboBox1.DataSource = purchaseLineStatusBindingSource; comboBox1.DataSource = purchaseLineStatusBindingSource;
comboBox1.DisplayMember = "PurchaseLineStatusName"; comboBox1.DisplayMember = "PurchaseLineStatusName";
comboBox1.FormattingEnabled = true; comboBox1.FormattingEnabled = true;
comboBox1.Location = new Point(580, 46); comboBox1.Location = new Point(195, 46);
comboBox1.Name = "comboBox1"; comboBox1.Name = "comboBox1";
comboBox1.Size = new Size(214, 23); comboBox1.Size = new Size(189, 23);
comboBox1.TabIndex = 3; comboBox1.TabIndex = 3;
comboBox1.ValueMember = "PurchaseLineStatusId"; comboBox1.ValueMember = "PurchaseLineStatusId";
comboBox1.SelectedIndexChanged += comboBox1_SelectedIndexChanged; comboBox1.SelectedIndexChanged += comboBox1_SelectedIndexChanged;
@@ -109,12 +147,12 @@
purchaseLineStatusBindingSource.DataSource = typeof(Core.Model.Purchase.PurchaseLineStatus); purchaseLineStatusBindingSource.DataSource = typeof(Core.Model.Purchase.PurchaseLineStatus);
purchaseLineStatusBindingSource.CurrentChanged += purchaseLineStatusBindingSource_CurrentChanged; purchaseLineStatusBindingSource.CurrentChanged += purchaseLineStatusBindingSource_CurrentChanged;
// //
// dtTmOrderSearch // dateTimeOrderSearch
// //
dtTmOrderSearch.Location = new Point(356, 46); dateTimeOrderSearch.Location = new Point(31, 46);
dtTmOrderSearch.Name = "dtTmOrderSearch"; dateTimeOrderSearch.Name = "dateTimeOrderSearch";
dtTmOrderSearch.Size = new Size(157, 23); dateTimeOrderSearch.Size = new Size(131, 23);
dtTmOrderSearch.TabIndex = 2; dateTimeOrderSearch.TabIndex = 2;
// //
// label1 // label1
// //
@@ -125,12 +163,49 @@
label1.TabIndex = 1; label1.TabIndex = 1;
label1.Text = "Order Search"; label1.Text = "Order Search";
// //
// txtbxOrderSearch // textboxOrderSearch
// //
txtbxOrderSearch.Location = new Point(31, 46); textboxOrderSearch.Location = new Point(417, 46);
txtbxOrderSearch.Name = "txtbxOrderSearch"; textboxOrderSearch.Name = "textboxOrderSearch";
txtbxOrderSearch.Size = new Size(268, 23); textboxOrderSearch.Size = new Size(415, 23);
txtbxOrderSearch.TabIndex = 0; textboxOrderSearch.TabIndex = 0;
//
// purchaseNumberDataGridViewTextBoxColumn
//
purchaseNumberDataGridViewTextBoxColumn.DataPropertyName = "PurchaseNumber";
purchaseNumberDataGridViewTextBoxColumn.HeaderText = "PurchaseNumber";
purchaseNumberDataGridViewTextBoxColumn.Name = "purchaseNumberDataGridViewTextBoxColumn";
//
// purchaseDateDataGridViewTextBoxColumn
//
purchaseDateDataGridViewTextBoxColumn.DataPropertyName = "PurchaseDate";
purchaseDateDataGridViewTextBoxColumn.HeaderText = "PurchaseDate";
purchaseDateDataGridViewTextBoxColumn.Name = "purchaseDateDataGridViewTextBoxColumn";
//
// itemDescriptionDataGridViewTextBoxColumn
//
itemDescriptionDataGridViewTextBoxColumn.DataPropertyName = "ItemDescription";
itemDescriptionDataGridViewTextBoxColumn.HeaderText = "ItemDescription";
itemDescriptionDataGridViewTextBoxColumn.Name = "itemDescriptionDataGridViewTextBoxColumn";
itemDescriptionDataGridViewTextBoxColumn.Width = 500;
//
// purchaseLineIdDataGridViewTextBoxColumn
//
purchaseLineIdDataGridViewTextBoxColumn.DataPropertyName = "PurchaseLineId";
purchaseLineIdDataGridViewTextBoxColumn.HeaderText = "PurchaseLineId";
purchaseLineIdDataGridViewTextBoxColumn.Name = "purchaseLineIdDataGridViewTextBoxColumn";
//
// lineStatusDataGridViewTextBoxColumn
//
lineStatusDataGridViewTextBoxColumn.DataPropertyName = "LineStatus";
lineStatusDataGridViewTextBoxColumn.HeaderText = "LineStatus";
lineStatusDataGridViewTextBoxColumn.Name = "lineStatusDataGridViewTextBoxColumn";
//
// purchaseIdDataGridViewTextBoxColumn
//
purchaseIdDataGridViewTextBoxColumn.DataPropertyName = "PurchaseId";
purchaseIdDataGridViewTextBoxColumn.HeaderText = "PurchaseId";
purchaseIdDataGridViewTextBoxColumn.Name = "purchaseIdDataGridViewTextBoxColumn";
// //
// Form1 // Form1
// //
@@ -144,6 +219,8 @@
tabControl1.ResumeLayout(false); tabControl1.ResumeLayout(false);
Receiving.ResumeLayout(false); Receiving.ResumeLayout(false);
Receiving.PerformLayout(); Receiving.PerformLayout();
((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
((System.ComponentModel.ISupportInitialize)purchaseLineStatusBindingSource).EndInit(); ((System.ComponentModel.ISupportInitialize)purchaseLineStatusBindingSource).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@@ -154,10 +231,19 @@
private TabPage tabPage1; private TabPage tabPage1;
private TabPage tabPage2; private TabPage tabPage2;
private TabPage Receiving; private TabPage Receiving;
private TextBox txtbxOrderSearch; private TextBox textboxOrderSearch;
private Label label1; private Label label1;
private DateTimePicker dtTmOrderSearch; private DateTimePicker dateTimeOrderSearch;
private ComboBox comboBox1; private ComboBox comboBox1;
private BindingSource purchaseLineStatusBindingSource; private BindingSource purchaseLineStatusBindingSource;
private Button buttonSearch;
private DataGridView dataGridView1;
private BindingSource bindingSource1;
private DataGridViewTextBoxColumn purchaseNumberDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn purchaseDateDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn itemDescriptionDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn purchaseLineIdDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn lineStatusDataGridViewTextBoxColumn;
private DataGridViewTextBoxColumn purchaseIdDataGridViewTextBoxColumn;
} }
} }

View File

@@ -34,8 +34,8 @@ namespace bnhtrade.gui
private void InitialiseTabReceiving() private void InitialiseTabReceiving()
{ {
purchaseLineStatusBindingSource.DataSource = new Core.Logic.Account.PurchaseInvoice().ReadLineStatusToList(); purchaseLineStatusBindingSource.DataSource = new Core.Logic.Account.PurchaseInvoice().ReadLineStatusToList();
comboBox1.SelectedIndex = 3;
initTabReceiving = true; initTabReceiving = true;
MessageBox.Show("ldsakjfl;s");
} }
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
@@ -48,5 +48,20 @@ namespace bnhtrade.gui
} }
private void buttonSearch_Click(object sender, EventArgs e)
{
char[] separator = { ' ' };
var searchList = textboxOrderSearch.Text.Split(separator).ToList();
bindingSource1.DataSource = new Core.Logic.Account.PurchaseInvoice().GetLineSummary(
dateTimeOrderSearch.Value
, comboBox1.Text
, searchList);
}
private void bindingSource1_CurrentChanged(object sender, EventArgs e)
{
}
} }
} }

View File

@@ -117,8 +117,8 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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> </resheader>
<metadata name="purchaseLineStatusBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>250, 17</value>
</metadata> </metadata>
<metadata name="purchaseLineStatusBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="purchaseLineStatusBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="PurchaseInvoice" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>bnhtrade.Core.Model.Account.PurchaseInvoice, bnhtrade.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="PurchaseInvoiceLineSummary" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>bnhtrade.Core.Model.Account.PurchaseInvoiceLineSummary, bnhtrade.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

View File

@@ -36,4 +36,8 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Model\" />
</ItemGroup>
</Project> </Project>