업무일ㅈ 출력물에 공정 선택 기능 연결 (기존에는 선택가능했으나 적용 안되있었음), 프로젝트 목록에서 완료일 기준으로 정렬하는 기능 추가
This commit is contained in:
		
							
								
								
									
										85
									
								
								SubProject/FPJ0000/dsReport.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										85
									
								
								SubProject/FPJ0000/dsReport.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -8808,7 +8808,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O | ||||
|         [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 = 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, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason | ||||
| @@ -8820,6 +8820,17 @@ ORDER BY pdate"; | ||||
|             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, "id", 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 = @"SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason | ||||
| FROM     vJobReportForUser | ||||
| WHERE  (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess) | ||||
| ORDER BY pdate"; | ||||
|             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.Current, false, null, "", "", "")); | ||||
|             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.Current, 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.Current, false, null, "", "", "")); | ||||
|             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||
|         } | ||||
|          | ||||
|         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
| @@ -8893,6 +8904,78 @@ ORDER BY pdate"; | ||||
|             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")] | ||||
|         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] | ||||
|         public virtual int FillByProcess(dsReport.vJobReportForUserDataTable dataTable, string gcode, string sd, string ed, string userprocess) { | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[1]; | ||||
|             if ((gcode == null)) { | ||||
|                 throw new global::System.ArgumentNullException("gcode"); | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); | ||||
|             } | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); | ||||
|             } | ||||
|             if ((ed == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); | ||||
|             } | ||||
|             if ((userprocess == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[3].Value = ((string)(userprocess)); | ||||
|             } | ||||
|             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, false)] | ||||
|         public virtual dsReport.vJobReportForUserDataTable GetByProcess(string gcode, string sd, string ed, string userprocess) { | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[1]; | ||||
|             if ((gcode == null)) { | ||||
|                 throw new global::System.ArgumentNullException("gcode"); | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); | ||||
|             } | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); | ||||
|             } | ||||
|             if ((ed == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); | ||||
|             } | ||||
|             if ((userprocess == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 this.Adapter.SelectCommand.Parameters[3].Value = ((string)(userprocess)); | ||||
|             } | ||||
|             dsReport.vJobReportForUserDataTable dataTable = new dsReport.vJobReportForUserDataTable(); | ||||
|             this.Adapter.Fill(dataTable); | ||||
|             return dataTable; | ||||
|         } | ||||
|     } | ||||
|      | ||||
|     /// <summary> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 chi
					chi