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

@@ -11367,18 +11367,25 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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 bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (sid IN (SELECT sid FROM Items AS Items_1 GROUP BY sid HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') AND (cate LIKE @cate) AND (gcode = @gcode) ORDER BY sid, name, idx";
this._commandCollection[3].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid
FROM Items
WHERE (sid IN
(SELECT sid
FROM Items AS Items_1
GROUP BY sid
HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') AND (gcode = @gcode) AND (ISNULL(cate, '') LIKE @cate)
ORDER BY sid, name, idx";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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("@cate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, na" +
"me, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ca" +
"te LIKE @cate) AND (gcode = @code) ORDER BY name, idx";
this._commandCollection[4].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, n" +
"ame, price, scale, sid, supply, supplyidx, unit, wdate, wuid\r\nFROM Items\r\nWH" +
"ERE (gcode = @code) AND (ISNULL(cate, \'\') LIKE @cate)\r\nORDER BY name, idx";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(sid, N'') LIKE @search OR ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx";
@@ -11441,19 +11448,19 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
[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 FillDupCheck(dsMSSQL.ItemsDataTable dataTable, string cate, string gcode) {
public virtual int FillDupCheck(dsMSSQL.ItemsDataTable dataTable, string gcode, string cate) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((cate == null)) {
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
if ((cate == null)) {
throw new global::System.ArgumentNullException("cate");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
@@ -11466,19 +11473,19 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
[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 dsMSSQL.ItemsDataTable GetDupCheck(string cate, string gcode) {
public virtual dsMSSQL.ItemsDataTable GetDupCheck(string gcode, string cate) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((cate == null)) {
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
if ((cate == null)) {
throw new global::System.ArgumentNullException("cate");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable();
this.Adapter.Fill(dataTable);
@@ -11489,19 +11496,19 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
[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 FillNoImage(dsMSSQL.ItemsDataTable dataTable, string cate, string code) {
public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable, string code, string cate) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((cate == null)) {
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(code));
}
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
if ((cate == null)) {
throw new global::System.ArgumentNullException("cate");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(code));
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
@@ -11514,19 +11521,19 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
[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 dsMSSQL.ItemsDataTable GetNoImage(string cate, string code) {
public virtual dsMSSQL.ItemsDataTable GetNoImage(string code, string cate) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((cate == null)) {
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(code));
}
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
if ((cate == null)) {
throw new global::System.ArgumentNullException("cate");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(code));
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable();
this.Adapter.Fill(dataTable);
@@ -12199,17 +12206,20 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
this._adapter.InsertCommand.CommandText = @"INSERT INTO Common
(grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode)
VALUES (@grp,@code,@svalue,@ivalue,@fvalue,@memo,@wuid,@wdate,@gcode);
SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) ORDER BY grp, memo";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@svalue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ivalue", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fvalue", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fvalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@svalue", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "svalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ivalue", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "ivalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fvalue", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "fvalue", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.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._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ([gcode] = @Original_gcode));
@@ -12417,7 +12427,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode FROM Com
[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.Insert, true)]
public virtual int Insert(string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate) {
public virtual int Insert(string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate, string gcode) {
if ((grp == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -12461,6 +12471,12 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode FROM Com
this.Adapter.InsertCommand.Parameters[6].Value = ((string)(wuid));
}
this.Adapter.InsertCommand.Parameters[7].Value = ((System.DateTime)(wdate));
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.InsertCommand.Parameters[8].Value = ((string)(gcode));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {