This commit is contained in:
chikyun.kim
2019-08-23 18:08:04 +09:00
parent 63dffe62ef
commit 6a90be2e6d
26 changed files with 933 additions and 436 deletions

View File

@@ -2391,16 +2391,18 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid,
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, wdate, dbo.getUserName(wuid) AS userName
FROM LogData
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(serial, '') LIKE @search OR
ISNULL(result, '') LIKE @search OR
ISNULL(remark, '') LIKE @search) OR
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (serial LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (result LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (location LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (reason LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (remark LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(wuid) LIKE @search)
ORDER BY 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, 20, 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("@search", 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("@search", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2428,7 +2430,7 @@ ORDER BY pdate DESC";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search));
@@ -2465,7 +2467,7 @@ ORDER BY pdate DESC";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search));