파트리스트 금액칸 9백에서 9조로 수정 함 (붙여넣기 값 오류 있었음)

This commit is contained in:
chi
2020-05-11 13:00:44 +09:00
parent f68c0a0ea4
commit 91c2ddc961
17 changed files with 720 additions and 470 deletions

View File

@@ -1355,6 +1355,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnname;
private global::System.Data.DataColumn columngcode;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProcessUserListDataTable() {
@@ -1404,6 +1406,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1441,11 +1451,12 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProcessUserListRow AddProcessUserListRow(string id, string name) {
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
id,
name};
name,
gcode};
rowProcessUserListRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProcessUserListRow);
return rowProcessUserListRow;
@@ -1470,6 +1481,7 @@ namespace FPJ0000 {
internal void InitVars() {
this.columnid = base.Columns["id"];
this.columnname = base.Columns["name"];
this.columngcode = base.Columns["gcode"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1479,11 +1491,14 @@ namespace FPJ0000 {
base.Columns.Add(this.columnid);
this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnname);
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.columnid}, false));
this.columnid.Unique = true;
this.columnid.MaxLength = 20;
this.columnname.MaxLength = 100;
this.columngcode.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2269,6 +2284,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string gcode {
get {
if (this.IsgcodeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.gcodeColumn]));
}
}
set {
this[this.tableProcessUserList.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsidNull() {
@@ -2292,6 +2323,18 @@ namespace FPJ0000 {
public void SetnameNull() {
this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableProcessUserList.gcodeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetgcodeNull() {
this[this.tableProcessUserList.gcodeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3301,28 +3344,34 @@ ORDER BY processs, JobReport.pdate, uname";
tableMapping.DataSetTable = "ProcessUserList";
tableMapping.ColumnMappings.Add("id", "id");
tableMapping.ColumnMappings.Add("name", "name");
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;
this._adapter.DeleteCommand.CommandText = "DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Origina" +
"l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))" +
"";
"l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) " +
"AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name";
this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name, [gcode] = @gcode WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));
SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name, Users.gcode ORDER BY Users.name";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -3339,19 +3388,22 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT Users.id, Users.name\r\nFROM Users RIGHT OUTER JOIN\r\n Job" +
"Report ON Users.id = JobReport.uid\r\nWHERE (Users.processs LIKE @process) AND (U" +
"sers.id <> \'dev\') AND (Users.id <> \'test\')\r\nGROUP BY Users.id, Users.name\r\nORDER" +
" BY Users.name";
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, Users.gcode
FROM Users RIGHT OUTER JOIN
JobReport ON Users.id = JobReport.uid
WHERE (Users.processs LIKE @process) AND (Users.id <> 'dev') AND (Users.id <> 'test') AND (Users.gcode = @gcode)
GROUP BY Users.id, Users.name, Users.gcode
ORDER BY Users.name";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "processs", 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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[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, true)]
public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process) {
public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((process == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3359,6 +3411,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
}
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();
}
@@ -3370,7 +3428,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[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, true)]
public virtual dsReport.ProcessUserListDataTable GetData(string process) {
public virtual dsReport.ProcessUserListDataTable GetData(string process, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((process == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3378,6 +3436,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsReport.ProcessUserListDataTable dataTable = new dsReport.ProcessUserListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -3416,7 +3480,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[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.Delete, true)]
public virtual int Delete(string Original_id, string Original_name) {
public virtual int Delete(string Original_id, string Original_name, string Original_gcode) {
if ((Original_id == null)) {
throw new global::System.ArgumentNullException("Original_id");
}
@@ -3432,6 +3496,14 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_name));
}
if ((Original_gcode == null)) {
this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_gcode));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -3452,7 +3524,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[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.Update, true)]
public virtual int Update(string id, string name, string Original_id, string Original_name, int idx) {
public virtual int Update(string id, string name, string gcode, string Original_id, string Original_name, string Original_gcode, int idx) {
if ((id == null)) {
throw new global::System.ArgumentNullException("id");
}
@@ -3465,22 +3537,36 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(name));
}
if ((gcode == null)) {
this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(gcode));
}
if ((Original_id == null)) {
throw new global::System.ArgumentNullException("Original_id");
}
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Original_id));
this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_id));
}
if ((Original_name == null)) {
this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_name));
this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_name));
}
this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(idx));
if ((Original_gcode == null)) {
this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_gcode));
}
this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {