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

View File

@@ -3828,20 +3828,21 @@ WHERE (idx = @Original_idx)";
B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid
FROM Inventory AS A LEFT OUTER JOIN
Items AS B ON A.item = B.idx
WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid)
WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) AND (A.invtype LIKE @invtype)
ORDER BY A.pdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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("@uid", 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("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[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(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string uid) {
public virtual int Fill(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string uid, string invtype) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -3867,6 +3868,12 @@ ORDER BY A.pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -3878,7 +3885,7 @@ ORDER BY A.pdate 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 DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string uid) {
public virtual DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string uid, string invtype) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -3904,6 +3911,12 @@ ORDER BY A.pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid));
}
if ((invtype == null)) {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype));
}
DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable();
this.Adapter.Fill(dataTable);
return dataTable;