190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함

품목정보 정렬 기능 추가
190731  로그기록화면(beta)추가
This commit is contained in:
chikyun.kim
2019-08-06 11:38:05 +09:00
parent 11d7c7f704
commit 63dffe62ef
95 changed files with 21458 additions and 845 deletions

View File

@@ -2800,7 +2800,7 @@ SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.g
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid,
@@ -2819,12 +2819,24 @@ ORDER BY pdate DESC";
this._commandCollection[1].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[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT cr_amt, cr_qty, dr_amt, dr_qty, gcode, idx, invtype, item, dbo.getItemModel(item) AS itemModel, dbo.getItemName(item) AS itemName, memo, pdate, place, project, projectName, serial, uid, wdate, wuid FROM Inventory WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) ORDER BY pdate DESC";
this._commandCollection[2].CommandText = @"SELECT idx, gcode, pdate, invtype, uid, dbo.getItemName(item) AS itemName, dbo.getItemModel(item) AS itemModel, serial, dr_qty, dr_amt, cr_qty, cr_amt, place, memo, project, projectName, wuid,
wdate, item
FROM Inventory
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (item = @item)
ORDER BY pdate DESC";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].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[2].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[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@item", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "item", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT cr_amt, cr_qty, dr_amt, dr_qty, gcode, idx, invtype, item, dbo.getItemModel(item) AS itemModel, dbo.getItemName(item) AS itemName, memo, pdate, place, project, projectName, serial, uid, wdate, wuid FROM Inventory WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) ORDER BY pdate DESC";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].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[3].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[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2927,7 +2939,7 @@ ORDER BY 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.Fill, false)]
public virtual int FillByUid(DSInventory.InventoryDataTable dataTable, string gcode, string sd, string ed, string uid) {
public virtual int FillByDateItem(DSInventory.InventoryDataTable dataTable, string gcode, string sd, string ed, global::System.Nullable<int> item) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
@@ -2947,6 +2959,78 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((item.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(item.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
int returnValue = this.Adapter.Fill(dataTable);
return returnValue;
}
[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.Select, false)]
public virtual DSInventory.InventoryDataTable GetByDateItem(string gcode, string sd, string ed, global::System.Nullable<int> item) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
}
if ((ed == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((item.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(item.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
DSInventory.InventoryDataTable dataTable = new DSInventory.InventoryDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[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, false)]
public virtual int FillByUid(DSInventory.InventoryDataTable dataTable, string gcode, string sd, string ed, string uid) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
}
if ((ed == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((uid == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
@@ -2965,7 +3049,7 @@ ORDER BY pdate DESC";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DSInventory.InventoryDataTable GetByUid(string gcode, string sd, string ed, string uid) {
this.Adapter.SelectCommand = this.CommandCollection[2];
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}