업무일지 입력창을 rtf 로 변경

This commit is contained in:
chi
2020-05-19 10:43:16 +09:00
parent 0daf284264
commit 117d7a3ba2
24 changed files with 9614 additions and 9364 deletions

View File

@@ -9859,12 +9859,17 @@ ORDER BY sid, name, idx";
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, 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].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid
FROM Items
WHERE (gcode = @code) AND (ISNULL(cate, N'') LIKE @cate) AND (ISNULL(name, N'') LIKE @search OR
ISNULL(model, N'') LIKE @search OR
ISNULL(sid, N'') LIKE @search OR
ISNULL(manu, N'') LIKE @search)
ORDER BY name, idx";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 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";
@@ -9976,7 +9981,7 @@ ORDER BY sid, name, idx";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 code, string cate) {
public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable, string code, string cate, string search) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -9990,6 +9995,12 @@ ORDER BY sid, name, idx";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -10001,7 +10012,7 @@ ORDER BY sid, name, idx";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 code, string cate) {
public virtual dsMSSQL.ItemsDataTable GetNoImage(string code, string cate, string search) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10015,6 +10026,12 @@ ORDER BY sid, name, idx";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search));
}
dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable();
this.Adapter.Fill(dataTable);
return dataTable;