diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 5b9ffab..cea3b02 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -369,21 +369,21 @@ namespace Project.Dialog newdr.wdate = DateTime.Now; newdr.pdate = nd; newdr.import = false; - newdr.hrs = dr.hrs; - newdr.type = dr.type;//210305 누락분 추가 - newdr.ot = dr.ot; - newdr.process = dr.process; - newdr.projectName = dr.projectName; - newdr.pidx = dr.pidx; - newdr.package = dr.package; - newdr.autoinput = true; - newdr.description = dr.description; - newdr.description2 = dr.description2; - newdr.remark = dr.remark; - newdr.requestpart = dr.requestpart; - newdr.status = dr.status; - newdr.tag = dr.tag; - newdr.uid = dr.uid; + if (dr.IshrsNull() == false) newdr.hrs = dr.hrs; + if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가 + if (dr.IsotNull() == false) newdr.ot = dr.ot; + if (dr.IsprocessNull() == false) newdr.process = dr.process; + if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName; + if (dr.IspidxNull() == false) newdr.pidx = dr.pidx; + if (dr.IspackageNull() == false) newdr.package = dr.package; + newdr.autoinput = true; + if (dr.IsdescriptionNull() == false) newdr.description = dr.description; + if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2; + if (dr.IsremarkNull() == false) newdr.remark = dr.remark; + if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart; + if (dr.IsstatusNull() == false) newdr.status = dr.status; + if (dr.IstagNull() == false) newdr.tag = dr.tag; + if (dr.IsuidNull() == false) newdr.uid = dr.uid; newjob.AddJobReportRow(newdr); } diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index ad532d0..4d246a9 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("25.04.07.0016")] -[assembly: AssemblyFileVersion("25.04.07.0016")] +[assembly: AssemblyVersion("25.04.07.1500")] +[assembly: AssemblyFileVersion("25.04.07.1500")] diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 479e5b6..bf67903 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -14340,11 +14340,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string projectName { get { - try { - return ((string)(this[this.tableJobReport.projectNameColumn])); + if (this.IsprojectNameNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'projectName\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.projectNameColumn])); } } set { @@ -14356,11 +14356,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string uid { get { - try { - return ((string)(this[this.tableJobReport.uidColumn])); + if (this.IsuidNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'uid\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.uidColumn])); } } set { @@ -14372,11 +14372,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string requestpart { get { - try { - return ((string)(this[this.tableJobReport.requestpartColumn])); + if (this.IsrequestpartNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'requestpart\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.requestpartColumn])); } } set { @@ -14388,11 +14388,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string package { get { - try { - return ((string)(this[this.tableJobReport.packageColumn])); + if (this.IspackageNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'package\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.packageColumn])); } } set { @@ -14404,11 +14404,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string status { get { - try { - return ((string)(this[this.tableJobReport.statusColumn])); + if (this.IsstatusNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'status\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.statusColumn])); } } set { @@ -14420,11 +14420,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string type { get { - try { - return ((string)(this[this.tableJobReport.typeColumn])); + if (this.IstypeNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'type\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.typeColumn])); } } set { @@ -14436,11 +14436,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string process { get { - try { - return ((string)(this[this.tableJobReport.processColumn])); + if (this.IsprocessNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'process\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.processColumn])); } } set { @@ -14452,11 +14452,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string description { get { - try { - return ((string)(this[this.tableJobReport.descriptionColumn])); + if (this.IsdescriptionNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'description\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.descriptionColumn])); } } set { @@ -14468,11 +14468,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string remark { get { - try { - return ((string)(this[this.tableJobReport.remarkColumn])); + if (this.IsremarkNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'remark\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.remarkColumn])); } } set { @@ -14554,11 +14554,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string description2 { get { - try { - return ((string)(this[this.tableJobReport.description2Column])); + if (this.Isdescription2Null()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'description2\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.description2Column])); } } set { @@ -14570,11 +14570,11 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public string tag { get { - try { - return ((string)(this[this.tableJobReport.tagColumn])); + if (this.IstagNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'tag\' 열의 값이 DBNull입니다.", e); + else { + return ((string)(this[this.tableJobReport.tagColumn])); } } set { diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 912224e..ca196bf 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -3483,63 +3483,63 @@ WHERE (idx = @idx) - + - + - + - + - + - + - + - + - + @@ -3557,14 +3557,14 @@ WHERE (idx = @idx) - + - + @@ -4718,116 +4718,116 @@ WHERE (idx = @idx) - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 683df10..4a49da2 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -4,20 +4,20 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - - + + - - - - - + + + + + @@ -26,7 +26,7 @@ - + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 0ac332a..72e8fb8 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -366,6 +366,7 @@ namespace FPJ0000 var taMdata = new dsMailTableAdapters.MailDataTableAdapter(); var dtMdata = new FPJ0000.dsMail.MailDataDataTable(); var mbody = dtMdata.NewMailDataRow(); + mbody.gcode = FCOMMON.info.Login.gcode; mbody.tolist = mf.tolist; mbody.bcc = mf.bcc; mbody.cc = mf.cc; diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index 4306348..fc7e996 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -94,14 +94,13 @@ namespace FPJ0000 this.taProjectInfo.FillByIDX(this.dsPRJ.Projects, this.projectindex); //스케쥴 그룹(no) - var db = new dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter();// EEEntities(); - var nolist = db.GetNoList(FCOMMON.info.Login.gcode, this.projectindex);//.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).GroupBy(t => t.no).ToList(); + var db = new dsPRJTableAdapters.EETGW_ProjectsSchedule_NoListTableAdapter();// EEEntities(); + var nolist = db.GetData(FCOMMON.info.Login.gcode, this.projectindex);//.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).GroupBy(t => t.no).ToList(); this.comboBox1.Items.Clear(); if (nolist.Any()) { foreach (var item in nolist) { - if (item.IsnoNull()) continue; this.comboBox1.Items.Add(item.no.ToString()); } } diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index eb20b51..2e5b5d0 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -66,6 +66,8 @@ namespace FPJ0000 { private AuthDataTable tableAuth; + private EETGW_ProjectsSchedule_NoListDataTable tableEETGW_ProjectsSchedule_NoList; + private SCTableDataTable tableSCTable; private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; @@ -163,6 +165,9 @@ namespace FPJ0000 { if ((ds.Tables["Auth"] != null)) { base.Tables.Add(new AuthDataTable(ds.Tables["Auth"])); } + if ((ds.Tables["EETGW_ProjectsSchedule_NoList"] != null)) { + base.Tables.Add(new EETGW_ProjectsSchedule_NoListDataTable(ds.Tables["EETGW_ProjectsSchedule_NoList"])); + } if ((ds.Tables["SCTable"] != null)) { base.Tables.Add(new SCTableDataTable(ds.Tables["SCTable"])); } @@ -395,6 +400,16 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public EETGW_ProjectsSchedule_NoListDataTable EETGW_ProjectsSchedule_NoList { + get { + return this.tableEETGW_ProjectsSchedule_NoList; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -536,6 +551,9 @@ namespace FPJ0000 { if ((ds.Tables["Auth"] != null)) { base.Tables.Add(new AuthDataTable(ds.Tables["Auth"])); } + if ((ds.Tables["EETGW_ProjectsSchedule_NoList"] != null)) { + base.Tables.Add(new EETGW_ProjectsSchedule_NoListDataTable(ds.Tables["EETGW_ProjectsSchedule_NoList"])); + } if ((ds.Tables["SCTable"] != null)) { base.Tables.Add(new SCTableDataTable(ds.Tables["SCTable"])); } @@ -698,6 +716,12 @@ namespace FPJ0000 { this.tableAuth.InitVars(); } } + this.tableEETGW_ProjectsSchedule_NoList = ((EETGW_ProjectsSchedule_NoListDataTable)(base.Tables["EETGW_ProjectsSchedule_NoList"])); + if ((initTable == true)) { + if ((this.tableEETGW_ProjectsSchedule_NoList != null)) { + this.tableEETGW_ProjectsSchedule_NoList.InitVars(); + } + } this.tableSCTable = ((SCTableDataTable)(base.Tables["SCTable"])); if ((initTable == true)) { if ((this.tableSCTable != null)) { @@ -756,6 +780,8 @@ namespace FPJ0000 { base.Tables.Add(this.tableEETGW_DocuForm); this.tableAuth = new AuthDataTable(); base.Tables.Add(this.tableAuth); + this.tableEETGW_ProjectsSchedule_NoList = new EETGW_ProjectsSchedule_NoListDataTable(); + base.Tables.Add(this.tableEETGW_ProjectsSchedule_NoList); this.tableSCTable = new SCTableDataTable(); base.Tables.Add(this.tableSCTable); } @@ -886,6 +912,12 @@ namespace FPJ0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private bool ShouldSerializeEETGW_ProjectsSchedule_NoList() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private bool ShouldSerializeSCTable() { @@ -1017,6 +1049,9 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void AuthRowChangeEventHandler(object sender, AuthRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void EETGW_ProjectsSchedule_NoListRowChangeEventHandler(object sender, EETGW_ProjectsSchedule_NoListRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void SCTableRowChangeEventHandler(object sender, SCTableRowChangeEvent e); @@ -13538,6 +13573,264 @@ namespace FPJ0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class EETGW_ProjectsSchedule_NoListDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnno; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListDataTable() { + this.TableName = "EETGW_ProjectsSchedule_NoList"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal EETGW_ProjectsSchedule_NoListDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected EETGW_ProjectsSchedule_NoListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn noColumn { + get { + return this.columnno; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRow this[int index] { + get { + return ((EETGW_ProjectsSchedule_NoListRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event EETGW_ProjectsSchedule_NoListRowChangeEventHandler EETGW_ProjectsSchedule_NoListRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event EETGW_ProjectsSchedule_NoListRowChangeEventHandler EETGW_ProjectsSchedule_NoListRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event EETGW_ProjectsSchedule_NoListRowChangeEventHandler EETGW_ProjectsSchedule_NoListRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event EETGW_ProjectsSchedule_NoListRowChangeEventHandler EETGW_ProjectsSchedule_NoListRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddEETGW_ProjectsSchedule_NoListRow(EETGW_ProjectsSchedule_NoListRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRow AddEETGW_ProjectsSchedule_NoListRow(int no) { + EETGW_ProjectsSchedule_NoListRow rowEETGW_ProjectsSchedule_NoListRow = ((EETGW_ProjectsSchedule_NoListRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + no}; + rowEETGW_ProjectsSchedule_NoListRow.ItemArray = columnValuesArray; + this.Rows.Add(rowEETGW_ProjectsSchedule_NoListRow); + return rowEETGW_ProjectsSchedule_NoListRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRow FindByno(int no) { + return ((EETGW_ProjectsSchedule_NoListRow)(this.Rows.Find(new object[] { + no}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() { + EETGW_ProjectsSchedule_NoListDataTable cln = ((EETGW_ProjectsSchedule_NoListDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new EETGW_ProjectsSchedule_NoListDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() { + this.columnno = base.Columns["no"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() { + this.columnno = new global::System.Data.DataColumn("no", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnno); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnno}, true)); + this.columnno.AllowDBNull = false; + this.columnno.Unique = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRow NewEETGW_ProjectsSchedule_NoListRow() { + return ((EETGW_ProjectsSchedule_NoListRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new EETGW_ProjectsSchedule_NoListRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(EETGW_ProjectsSchedule_NoListRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.EETGW_ProjectsSchedule_NoListRowChanged != null)) { + this.EETGW_ProjectsSchedule_NoListRowChanged(this, new EETGW_ProjectsSchedule_NoListRowChangeEvent(((EETGW_ProjectsSchedule_NoListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.EETGW_ProjectsSchedule_NoListRowChanging != null)) { + this.EETGW_ProjectsSchedule_NoListRowChanging(this, new EETGW_ProjectsSchedule_NoListRowChangeEvent(((EETGW_ProjectsSchedule_NoListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.EETGW_ProjectsSchedule_NoListRowDeleted != null)) { + this.EETGW_ProjectsSchedule_NoListRowDeleted(this, new EETGW_ProjectsSchedule_NoListRowChangeEvent(((EETGW_ProjectsSchedule_NoListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.EETGW_ProjectsSchedule_NoListRowDeleting != null)) { + this.EETGW_ProjectsSchedule_NoListRowDeleting(this, new EETGW_ProjectsSchedule_NoListRowChangeEvent(((EETGW_ProjectsSchedule_NoListRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemoveEETGW_ProjectsSchedule_NoListRow(EETGW_ProjectsSchedule_NoListRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsPRJ ds = new dsPRJ(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "EETGW_ProjectsSchedule_NoListDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents the strongly named DataTable class. /// @@ -25611,6 +25904,32 @@ namespace FPJ0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class EETGW_ProjectsSchedule_NoListRow : global::System.Data.DataRow { + + private EETGW_ProjectsSchedule_NoListDataTable tableEETGW_ProjectsSchedule_NoList; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal EETGW_ProjectsSchedule_NoListRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableEETGW_ProjectsSchedule_NoList = ((EETGW_ProjectsSchedule_NoListDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int no { + get { + return ((int)(this[this.tableEETGW_ProjectsSchedule_NoList.noColumn])); + } + set { + this[this.tableEETGW_ProjectsSchedule_NoList.noColumn] = value; + } + } + } + /// ///Represents strongly named DataRow class. /// @@ -26519,6 +26838,40 @@ namespace FPJ0000 { } } + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class EETGW_ProjectsSchedule_NoListRowChangeEvent : global::System.EventArgs { + + private EETGW_ProjectsSchedule_NoListRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRowChangeEvent(EETGW_ProjectsSchedule_NoListRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } + /// ///Row event argument class /// @@ -39893,7 +40246,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, " + @@ -39912,13 +40265,6 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "SELECT no\r\nFROM EETGW_ProjectsSchedule WITH (nolock)\r\nWHERE (gcode = @gcode" + - ") AND (project = @project)\r\nGROUP BY no\r\nORDER BY no"; - this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -40029,29 +40375,6 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, return dataTable; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual dsPRJ.EETGW_ProjectsScheduleDataTable GetNoList(string gcode, global::System.Nullable project) { - this.Adapter.SelectCommand = this.CommandCollection[2]; - if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; - } - else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); - } - if ((project.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((int)(project.Value)); - } - else { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; - } - dsPRJ.EETGW_ProjectsScheduleDataTable dataTable = new dsPRJ.EETGW_ProjectsScheduleDataTable(); - this.Adapter.Fill(dataTable); - return dataTable; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -44863,6 +45186,200 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class EETGW_ProjectsSchedule_NoListTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public EETGW_ProjectsSchedule_NoListTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "EETGW_ProjectsSchedule_NoList"; + tableMapping.ColumnMappings.Add("no", "no"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + 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 no\r\nFROM EETGW_ProjectsSchedule WITH (nolock)\r\nWHERE (gcode = @gcode" + + ") AND (project = @project)\r\nGROUP BY no\r\nORDER BY no"; + 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("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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.EETGW_ProjectsSchedule_NoListDataTable dataTable, string gcode, global::System.Nullable project) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((project.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(project.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsPRJ.EETGW_ProjectsSchedule_NoListDataTable GetData(string gcode, global::System.Nullable project) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((project.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(project.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + dsPRJ.EETGW_ProjectsSchedule_NoListDataTable dataTable = new dsPRJ.EETGW_ProjectsSchedule_NoListDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -45647,6 +46164,15 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(updatedRows); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._eETGW_Project_LayoutTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.EETGW_Project_Layout.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -45710,6 +46236,15 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(updatedRows); } } + if ((this._authTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._authTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._eETGW_ProjectToDoTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.EETGW_ProjectToDo.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -45719,15 +46254,6 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(updatedRows); } } - if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._projectPartStatusTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.ProjectPartStatus.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -45800,21 +46326,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(updatedRows); } } - if ((this._eETGW_DocuFormTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._eETGW_DocuFormTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._authTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._authTableAdapter.Update(updatedRows)); + result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -45836,6 +46353,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allAddedRows.AddRange(addedRows); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._eETGW_Project_LayoutTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.EETGW_Project_Layout.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -45892,6 +46417,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allAddedRows.AddRange(addedRows); } } + if ((this._authTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._authTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._eETGW_ProjectToDoTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.EETGW_ProjectToDo.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -45900,14 +46433,6 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allAddedRows.AddRange(addedRows); } } - if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._projectPartStatusTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.ProjectPartStatus.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -45972,19 +46497,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allAddedRows.AddRange(addedRows); } } - if ((this._eETGW_DocuFormTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._eETGW_DocuFormTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._authTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._authTableAdapter.Update(addedRows)); + result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -45998,19 +46515,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateDeletedRows(dsPRJ dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._authTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._authTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._eETGW_DocuFormTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._eETGW_DocuFormTableAdapter.Update(deletedRows)); + result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -46078,14 +46587,6 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(deletedRows); } } - if ((this._eETGW_ProjecthistoryDTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.EETGW_ProjecthistoryD.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._eETGW_ProjecthistoryDTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._eETGW_ProjectToDoTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.EETGW_ProjectToDo.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -46094,6 +46595,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(deletedRows); } } + if ((this._authTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Auth.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._authTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._eETGW_JobReport_EBoardTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.EETGW_JobReport_EBoard.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -46150,6 +46659,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche allChangedRows.AddRange(deletedRows); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._projectsTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Projects.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 65d5210..fb056d6 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2629,21 +2629,6 @@ ORDER BY seq - - - - SELECT no -FROM EETGW_ProjectsSchedule WITH (nolock) -WHERE (gcode = @gcode) AND (project = @project) -GROUP BY no -ORDER BY no - - - - - - - @@ -3375,6 +3360,29 @@ WHERE (gcode = @gcode) and user = @user + + + + + + SELECT no +FROM EETGW_ProjectsSchedule WITH (nolock) +WHERE (gcode = @gcode) AND (project = @project) +GROUP BY no +ORDER BY no + + + + + + + + + + + + + @@ -5567,80 +5575,87 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - + + - + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -5731,5 +5746,9 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index b196e8e..346af1a 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,31 +4,32 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file