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

@@ -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;