Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

190724

Browse Source
This commit is contained in:
chikyun.kim
2019-07-25 08:29:57 +09:00
parent 5c77244a45
commit ae209e00af
85 changed files with 21568 additions and 4313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

300
SubProject/FPJ0000/dsPRJ.Designer.cs generated
View File

@@ -569,6 +569,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnlasthistory;
private global::System.Data.DataColumn columngcode;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ProjectsDataTable() :
@@ -883,6 +885,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn gcodeColumn {
get {
return this.columngcode;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -953,7 +963,8 @@ namespace FPJ0000 {
string path,
string userhw2,
string orderno,
string lasthistory) {
string lasthistory,
string gcode) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -989,7 +1000,8 @@ namespace FPJ0000 {
path,
userhw2,
orderno,
lasthistory};
lasthistory,
gcode};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1029,7 +1041,8 @@ namespace FPJ0000 {
string path,
string userhw2,
string orderno,
string lasthistory) {
string lasthistory,
string gcode) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1065,7 +1078,8 @@ namespace FPJ0000 {
path,
userhw2,
orderno,
lasthistory};
lasthistory,
gcode};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1129,6 +1143,7 @@ namespace FPJ0000 {
this.columnuserhw2 = base.Columns["userhw2"];
this.columnorderno = base.Columns["orderno"];
this.columnlasthistory = base.Columns["lasthistory"];
this.columngcode = base.Columns["gcode"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1202,6 +1217,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnorderno);
this.columnlasthistory = new global::System.Data.DataColumn("lasthistory", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnlasthistory);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1236,6 +1253,7 @@ namespace FPJ0000 {
this.columnorderno.MaxLength = 50;
this.columnlasthistory.ReadOnly = true;
this.columnlasthistory.MaxLength = 200;
this.columngcode.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2788,6 +2806,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnprocess;
private global::System.Data.DataColumn columngcode;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public JobReportDataTable() {
@@ -2981,6 +3001,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn gcodeColumn {
get {
return this.columngcode;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3037,7 +3065,8 @@ namespace FPJ0000 {
string week,
double ot,
string ww,
string process) {
string process,
string gcode) {
JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -3059,7 +3088,8 @@ namespace FPJ0000 {
week,
ot,
ww,
process};
process,
gcode};
rowJobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportRow);
return rowJobReportRow;
@@ -3109,6 +3139,7 @@ namespace FPJ0000 {
this.columnot = base.Columns["ot"];
this.columnww = base.Columns["ww"];
this.columnprocess = base.Columns["process"];
this.columngcode = base.Columns["gcode"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3154,6 +3185,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnww);
this.columnprocess = new global::System.Data.DataColumn("process", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprocess);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -3179,6 +3212,7 @@ namespace FPJ0000 {
this.columnww.ReadOnly = true;
this.columnww.MaxLength = 6;
this.columnprocess.MaxLength = 50;
this.columngcode.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4608,6 +4642,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string gcode {
get {
if (this.IsgcodeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.gcodeColumn]));
}
}
set {
this[this.tableProjects.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsnameNull() {
@@ -4979,6 +5029,18 @@ namespace FPJ0000 {
public void SetlasthistoryNull() {
this[this.tableProjects.lasthistoryColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableProjects.gcodeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public void SetgcodeNull() {
this[this.tableProjects.gcodeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -6340,6 +6402,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string gcode {
get {
if (this.IsgcodeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReport.gcodeColumn]));
}
}
set {
this[this.tableJobReport.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IspdateNull() {
@@ -6543,6 +6621,18 @@ namespace FPJ0000 {
public void SetprocessNull() {
this[this.tableJobReport.processColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableJobReport.gcodeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public void SetgcodeNull() {
this[this.tableJobReport.gcodeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -7356,6 +7446,7 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("userhw2", "userhw2");
tableMapping.ColumnMappings.Add("orderno", "orderno");
tableMapping.ColumnMappings.Add("lasthistory", "lasthistory");
tableMapping.ColumnMappings.Add("gcode", "gcode");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -7366,8 +7457,8 @@ namespace FPJ0000.dsPRJTableAdapters {
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects
(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno);
progress, import, asset, isdel, path, userhw2, orderno, gcode)
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode);
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -7401,6 +7492,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 300, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", 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 Projects
@@ -7460,24 +7552,26 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0)
ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소')
THEN '9' ELSE '5' END)";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", 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("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "DELETE FROM [Projects] WHERE import = 1";
this._commandCollection[1].CommandText = "DELETE FROM Projects\r\nWHERE (import = 1) AND (gcode = @gcode)";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].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.Original, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -7485,19 +7579,20 @@ WHERE (idx = @idx)";
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode
FROM Projects
WHERE (ISNULL(name, N'') LIKE @search OR
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0)";
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].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[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, "", "", ""));
}
[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(dsPRJ.ProjectsDataTable dataTable, string state, string username) {
public virtual int Fill(dsPRJ.ProjectsDataTable dataTable, string state, string username, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((state == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -7511,6 +7606,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -7522,7 +7623,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR
[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 dsPRJ.ProjectsDataTable GetData(string state, string username) {
public virtual dsPRJ.ProjectsDataTable GetData(string state, string username, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((state == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -7536,6 +7637,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode));
}
dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(true);
this.Adapter.Fill(dataTable);
return dataTable;
@@ -7571,7 +7678,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR
[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 FillSearch(dsPRJ.ProjectsDataTable dataTable, string search) {
public virtual int FillSearch(dsPRJ.ProjectsDataTable dataTable, string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
@@ -7579,6 +7686,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -7590,7 +7703,7 @@ WHERE (ISNULL(name, N'') LIKE @search OR
[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 dsPRJ.ProjectsDataTable GetSearch(string search) {
public virtual dsPRJ.ProjectsDataTable GetSearch(string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
@@ -7598,6 +7711,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(true);
this.Adapter.Fill(dataTable);
return dataTable;
@@ -7689,7 +7808,8 @@ WHERE (ISNULL(name, N'') LIKE @search OR
global::System.Nullable<bool> isdel,
string path,
string userhw2,
string orderno) {
string orderno,
string gcode) {
if ((status == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -7871,6 +7991,12 @@ WHERE (ISNULL(name, N'') LIKE @search OR
else {
this.Adapter.InsertCommand.Parameters[30].Value = ((string)(orderno));
}
if ((gcode == null)) {
this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[31].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)) {
@@ -8127,9 +8253,14 @@ WHERE (ISNULL(name, N'') LIKE @search OR
[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.Delete, false)]
public virtual int DeleteImport() {
public virtual int DeleteImport(string gcode) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
if ((gcode == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
}
else {
command.Parameters[0].Value = ((string)(gcode));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -10741,6 +10872,7 @@ ORDER BY Project, ItemGroup, no, ItemName";
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("ww", "ww");
tableMapping.ColumnMappings.Add("process", "process");
tableMapping.ColumnMappings.Add("gcode", "gcode");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -10777,25 +10909,28 @@ ORDER BY Project, ItemGroup, no, ItemName";
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", 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 [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process);
this._adapter.InsertCommand.CommandText = @"INSERT INTO JobReport
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode);
SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", 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("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", 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("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", 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 JobReport
@@ -10838,48 +10973,54 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,
process
process, gcode
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
ORDER BY pdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
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, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND " +
"(ISNULL(import, 0) = 1)";
"(ISNULL(import, 0) = 1) AND (gcode = @gcode)";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].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.Original, false, null, "", "", ""));
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.Original, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[1].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.Original, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
AS ww
AS ww, gcode
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname)
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
ORDER BY pdate DESC";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
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("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = "SELECT pidx, projectName, MAX(pdate) AS pdate\r\nFROM JobReport\r\nWHERE (ISNUL" +
"L(projectName, N\'\') LIKE @search OR\r\n ISNULL(description, N\'\') LIK" +
"E @search) AND (projectName <> \'\')\r\nGROUP BY pidx, projectName\r\nORDER BY project" +
"Name";
this._commandCollection[3].CommandText = @"SELECT pidx, projectName, MAX(pdate) AS pdate
FROM JobReport
WHERE (ISNULL(projectName, N'') LIKE @search OR
ISNULL(description, N'') LIKE @search) AND (projectName <> '') AND (gcode = @gcode)
GROUP BY pidx, projectName
ORDER BY projectName";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].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[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, "", "", ""));
}
[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(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string uid) {
public virtual int Fill(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string uid, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10899,6 +11040,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -10910,7 +11057,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.Select, true)]
public virtual dsPRJ.JobReportDataTable GetData(string sd, string ed, string uid) {
public virtual dsPRJ.JobReportDataTable GetData(string sd, string ed, string uid, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10930,6 +11077,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
}
dsPRJ.JobReportDataTable dataTable = new dsPRJ.JobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -10939,7 +11092,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 FillPrjName(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string prjname) {
public virtual int FillPrjName(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string prjname, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10959,6 +11112,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -10970,7 +11129,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.Select, false)]
public virtual dsPRJ.JobReportDataTable GetPrjName(string sd, string ed, string prjname) {
public virtual dsPRJ.JobReportDataTable GetPrjName(string sd, string ed, string prjname, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10990,6 +11149,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
}
dsPRJ.JobReportDataTable dataTable = new dsPRJ.JobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -10999,7 +11164,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 FillSearch(dsPRJ.JobReportDataTable dataTable, string search) {
public virtual int FillSearch(dsPRJ.JobReportDataTable dataTable, string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
@@ -11007,6 +11172,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -11018,7 +11189,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.Select, false)]
public virtual dsPRJ.JobReportDataTable GetSearch(string search) {
public virtual dsPRJ.JobReportDataTable GetSearch(string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
@@ -11026,6 +11197,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsPRJ.JobReportDataTable dataTable = new dsPRJ.JobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -11229,7 +11406,8 @@ ORDER BY pdate DESC";
System.DateTime wdate,
string projectName,
global::System.Nullable<double> ot,
string process) {
string process,
string gcode) {
if ((pidx.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value));
}
@@ -11321,6 +11499,12 @@ ORDER BY pdate DESC";
else {
this.Adapter.InsertCommand.Parameters[15].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[16].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)) {
@@ -11472,7 +11656,7 @@ ORDER BY pdate DESC";
[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")]
public virtual int DeleteImport(string sd, string ed, string user) {
public virtual int DeleteImport(string sd, string ed, string user, string gcode) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
if ((sd == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
@@ -11492,6 +11676,12 @@ ORDER BY pdate DESC";
else {
command.Parameters[2].Value = ((string)(user));
}
if ((gcode == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
}
else {
command.Parameters[3].Value = ((string)(gcode));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {