diff --git a/Project/Web/Controller/HomeController.cs b/Project/Web/Controller/HomeController.cs index b6feefd..b861d9c 100644 --- a/Project/Web/Controller/HomeController.cs +++ b/Project/Web/Controller/HomeController.cs @@ -81,6 +81,7 @@ namespace Project.Web.Controllers } catch (Exception ex) { + Console.WriteLine( ex.Message); response.Success = false; response.Message = "로그인 처리 중 오류가 발생했습니다: " + ex.Message; } diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index ed0ca9e..5a9c28e 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -20,7 +20,7 @@ namespace FCOMMON return cn; } - public static void GetPurchaseWaitCount(string gcode,out int cnt1,out int cnt2) + public static void GetPurchaseWaitCount(string gcode, out int cnt1, out int cnt2) { cnt1 = 0; cnt2 = 0; @@ -38,9 +38,9 @@ namespace FCOMMON var cmd = new System.Data.SqlClient.SqlCommand(sql1, cn); cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode; cmd.Parameters.Add("date", SqlDbType.VarChar).Value = DateTime.Now.AddYears(-1).ToShortDateString(); - cnt1 = (int)cmd.ExecuteScalar(); + cnt1 = (int)cmd.ExecuteScalar(); cmd.CommandText = sql2; - cnt2 = (int)cmd.ExecuteScalar(); + cnt2 = (int)cmd.ExecuteScalar(); cn.Dispose(); } @@ -107,7 +107,18 @@ namespace FCOMMON var retval = new GroupUserModel(); var cn = getCn(); - var sql = "select * from EETGW_GroupUser where gcode = @gcode and uid = @uid"; + + // public string name { get; set; } + //public string email { get; set; } + //public bool useAccount { get; set; } + //public bool useJobReport { get; set; } + + + + var sql = "select gcode,id,level,isnull(Process,'') as Process ,isnull(name,'') as name,isnull(useUserState,0) as useAccount,isnull(useJobReport,0) as useJobReport "+ + " from vGroupUser where "+ + " gcode = @gcode "+ + " and id = @uid"; var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode; cmd.Parameters.Add("uid", SqlDbType.VarChar).Value = uid; @@ -117,9 +128,54 @@ namespace FCOMMON while (rdr.Read()) { retval.Gcode = rdr["gcode"].ToString(); - retval.uid = rdr["uid"].ToString(); + retval.uid = rdr["id"].ToString(); retval.level = int.Parse(rdr["level"]?.ToString() ?? "0"); retval.Process = rdr["Process"].ToString(); + retval.name = rdr["name"].ToString(); + retval.useAccount = rdr["useAccount"].ToString() == "True"; + retval.useJobReport = rdr["useJobReport"].ToString() == "True"; + cnt += 1; + } + + + cn.Dispose(); + if (cnt == 0) return null; + return retval; + } + public static List GetGroupUser(string gcode) + { + var retval = new List(); + var cn = getCn(); + + + // public string name { get; set; } + //public string email { get; set; } + //public bool useAccount { get; set; } + //public bool useJobReport { get; set; } + + + + var sql = "select gcode,id ,level,isnull(Process,'') as Process ,isnull(name,'') as name,isnull(useUserState,0) as useAccount,isnull(useJobReport,0) as useJobReport " + + " from vGroupUser " + + " where gcode = @gcode " + + " order by isnull(Process,'')+isnull(name,'')"; + + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode; + cn.Open(); + var rdr = cmd.ExecuteReader(); + var cnt = 0; + while (rdr.Read()) + { + retval.Add(new GroupUserModel { + Gcode = rdr["gcode"].ToString(), + uid = rdr["id"].ToString(), + level = int.Parse(rdr["level"]?.ToString() ?? "0"), + Process = rdr["Process"].ToString(), + name = rdr["name"].ToString(), + useAccount = rdr["useAccount"].ToString() == "True", + useJobReport = rdr["useJobReport"].ToString() == "True", + }); cnt += 1; } @@ -1816,18 +1872,18 @@ namespace FCOMMON { var retval = new List(); var cn = getCn(); - + try { cn.Open(); var cmd = new SqlCommand(sql, cn); - + // Add parameters if provided if (parameters != null) { AddParameters(cmd, parameters); } - + var rdr = cmd.ExecuteReader(); while (rdr.Read()) { @@ -1847,7 +1903,7 @@ namespace FCOMMON cn.Close(); cn.Dispose(); } - + return retval; } @@ -1862,12 +1918,12 @@ namespace FCOMMON public static T QuerySingle(string sql, object parameters = null) where T : new() { var results = Query(sql, parameters); - + if (results.Count == 0) throw new InvalidOperationException("Sequence contains no elements"); if (results.Count > 1) throw new InvalidOperationException("Sequence contains more than one element"); - + return results.First(); } @@ -1882,12 +1938,12 @@ namespace FCOMMON public static T QuerySingleOrDefault(string sql, object parameters = null) where T : new() { var results = Query(sql, parameters); - + if (results.Count == 0) return default(T); if (results.Count > 1) throw new InvalidOperationException("Sequence contains more than one element"); - + return results.First(); } @@ -1901,18 +1957,18 @@ namespace FCOMMON { var cn = getCn(); int retval = 0; - + try { cn.Open(); var cmd = new SqlCommand(sql, cn); - + // Add parameters if provided if (parameters != null) { AddParameters(cmd, parameters); } - + retval = cmd.ExecuteNonQuery(); cmd.Dispose(); } @@ -1925,7 +1981,7 @@ namespace FCOMMON cn.Close(); cn.Dispose(); } - + return retval; } @@ -1937,7 +1993,7 @@ namespace FCOMMON private static void AddParameters(SqlCommand cmd, object parameters) { if (parameters == null) return; - + var properties = parameters.GetType().GetProperties(); foreach (var prop in properties) { @@ -1957,19 +2013,19 @@ namespace FCOMMON var obj = new T(); var type = typeof(T); var properties = type.GetProperties(BindingFlags.Public | BindingFlags.Instance); - + foreach (var prop in properties) { // Check if the property has a setter if (!prop.CanWrite) continue; - + // Try to find a column with the same name (case insensitive) var columnName = FindColumnName(reader, prop.Name); if (columnName == null) continue; - + var value = reader[columnName]; if (value == DBNull.Value) continue; - + // Convert the value to the property type if needed try { @@ -1991,7 +2047,7 @@ namespace FCOMMON // If conversion fails, skip this property } } - + return obj; } diff --git a/SubProject/FCOMMON/Models/GroupUserModel.cs b/SubProject/FCOMMON/Models/GroupUserModel.cs index 9c46829..c9c5474 100644 --- a/SubProject/FCOMMON/Models/GroupUserModel.cs +++ b/SubProject/FCOMMON/Models/GroupUserModel.cs @@ -8,5 +8,9 @@ public string uid { get; set; } public string Process { get; set; } public int level { get; set; } + public string name { get; set; } + public string email { get; set; } + public bool useAccount { get; set; } + public bool useJobReport { get; set; } } } diff --git a/SubProject/FCOMMON/fSFI.Designer.cs b/SubProject/FCOMMON/fSFI.Designer.cs index 0dda9ea..024b2ea 100644 --- a/SubProject/FCOMMON/fSFI.Designer.cs +++ b/SubProject/FCOMMON/fSFI.Designer.cs @@ -607,7 +607,6 @@ namespace FCOMMON this.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); this.Name = "fSFI"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "fSFI"; this.Load += new System.EventHandler(this.fSFI_Load); this.panel1.ResumeLayout(false); @@ -660,7 +659,6 @@ namespace FCOMMON public System.Windows.Forms.NumericUpDown nudMSaveCnt; public System.Windows.Forms.NumericUpDown nudMsavetime; private System.Windows.Forms.Label label14; - private System.Windows.Forms.NumericUpDown nudCnt; private System.Windows.Forms.Label label17; public System.Windows.Forms.NumericUpDown nudShiftCnt; private System.Windows.Forms.Label label19; @@ -670,5 +668,6 @@ namespace FCOMMON private System.Windows.Forms.NumericUpDown nudCSFIMFG; private System.Windows.Forms.Label label16; public System.Windows.Forms.NumericUpDown nudSFIMFG; + public System.Windows.Forms.NumericUpDown nudCnt; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index c04584f..fb9ab89 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -100,9 +100,12 @@ this.qlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); @@ -125,21 +128,18 @@ this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -478,7 +478,7 @@ this.toolStripMenuItem4, this.상태일괄변경ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(249, 352); + this.cm.Size = new System.Drawing.Size(251, 352); // // columnSizeToolStripMenuItem // @@ -488,14 +488,14 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.columnSizeToolStripMenuItem.Text = "Column Size"; // // autoToolStripMenuItem // this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(147, 36); + this.autoToolStripMenuItem.Size = new System.Drawing.Size(149, 36); this.autoToolStripMenuItem.Text = "Auto"; this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); // @@ -503,7 +503,7 @@ // this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(147, 36); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 36); this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -511,7 +511,7 @@ // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(147, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(149, 36); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -519,77 +519,91 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(147, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(149, 36); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // exportListToolStripMenuItem // this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.exportListToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.exportListToolStripMenuItem.Text = "Export List"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(245, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(247, 6); // // refreshToolStripMenuItem // this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.refreshToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.refreshToolStripMenuItem.Text = "Refresh"; this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(245, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(247, 6); // // partListToolStripMenuItem // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; - this.partListToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.partListToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.partListToolStripMenuItem.Text = "PartList"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(245, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(247, 6); // // 복사ToolStripMenuItem // this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; - this.복사ToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.복사ToolStripMenuItem.Text = "복사"; this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); // // qlToolStripMenuItem // this.qlToolStripMenuItem.Name = "qlToolStripMenuItem"; - this.qlToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.qlToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.qlToolStripMenuItem.Text = "복사(기간)"; this.qlToolStripMenuItem.Click += new System.EventHandler(this.qlToolStripMenuItem_Click); // // 편집ToolStripMenuItem // this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; - this.편집ToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.편집ToolStripMenuItem.Text = "편집"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(248, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(250, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // + // toolStripMenuItem4 + // + this.toolStripMenuItem4.Name = "toolStripMenuItem4"; + this.toolStripMenuItem4.Size = new System.Drawing.Size(247, 6); + // + // 상태일괄변경ToolStripMenuItem + // + this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; + this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(250, 36); + this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; + this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); + // // tam // + this.tam.AuthTableAdapter = null; this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_DocuFormTableAdapter = null; this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; @@ -629,6 +643,193 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 21; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "일련번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "형태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "시작"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "종료"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "status"; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "형태"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "jobgrp"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "분류"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 90F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "공정"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + numberCellType3.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType1.TimeDefault = new System.DateTime(2025, 8, 28, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "시작"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2025, 8, 28, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "종료"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 2; + numberCellType4.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 10000000D; + numberCellType5.MinimumValue = -10000000D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(20).Tag = "idx"; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.Protect = false; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; + this.fpSpread1_Sheet1.ShowEditingRowSelector = true; + this.fpSpread1_Sheet1.ShowRowSelector = true; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); @@ -842,205 +1043,6 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(245, 6); - // - // 상태일괄변경ToolStripMenuItem - // - this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; - this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(248, 36); - this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; - this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 21; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "일련번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "형태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "시작"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "종료"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 30F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(5).Tag = "status"; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "형태"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "jobgrp"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "분류"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 90F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "공정"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - numberCellType3.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; - this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "시작"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType2.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "종료"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 2; - numberCellType4.NegativeRed = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 10000000D; - numberCellType5.MinimumValue = -10000000D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(20).Tag = "idx"; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.Protect = false; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; - this.fpSpread1_Sheet1.ShowEditingRowSelector = true; - this.fpSpread1_Sheet1.ShowRowSelector = true; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1060,13 +1062,13 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 6f63954..90b3ff3 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -243,20 +243,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALwSURBVDhPhZLrS1NhHMf3Kv+EsF70UojSyqioF6XpmhrY - zVTMvM0pmtrQhUG2mEbmJTRRoUKUohcV2kWntnnZ5tyGM1LnNe838LLUXc7Rnc1vzzlbaiD0gw/Pi+d8 - P5zf9xweO8GPVPFXi/WK8BL9b75UT5GT5ihlTwMdXqyjQ59rTRckmvKjER8OcKG9E/K0S7NsoVdNpkGn - 2bYJs3WXVQsLjeFFC/K+ziK6ZMQuyJB7eaLuCSvULptMw07dtAOGGQaGWQb6aQbaqS2ofm2iZciGTQZo - HKGQ93kGSS9N1D8SvrSF2rBvoXfOiR9zDDkZ9HCSLajHN/F9yE4ELvQuOmFYcKBAPovAh+3vuXBUacDk - bWnEtqjqJpIqb6GytQ759aUIlPoigCAoOI9g2RmUNZZxq1hpBktrdgTHqRlOEFkc+Kl9oAlNY29Qqc/h - JHEVoch5F4vMumgIq68hsToRjX1LaDJZ8a1/A+ukJ76si+YEgnKB1wlpllM/2om3AzIUqTI4SXxVGAlf - R+qrFGjGbdwqbWMUFKSHNZsD/Pxut4CdkEI1La5JgHFci2rDAzxTZiOq9DLiKyJgnLbDSIplC9ZMuDsx - E0GwbI/g4mOp42zuEcSWC9A7oUNBZxpkcjGiXwShTvUFP+cZGEmxuikHugnLFgcCn3gEpyTeIn/JYWTW - xuBOVQhiyq5wErE8FpL6FPImQWDve2ed6GE/McFCivTL0roF/pKD8/6SQ+Qhb/jneONGURDSXydAM6RA - gSIXaR8TIKyKhJEIDOTf0BMB7XARgWp3hUtZXfTiOo2+eSeHenQB92tSkUyCoupoZNfe27ljsW85iaBh - V8Da5sy7gv9hY1dI2SM4J+6wK/X92/s9vB+DI2Ou43GNVk+cFJmqnJzZsFs6DCbX5AqFyWUK4x5WrA4O - tnkrTQSDoy6KotZ97jYPeuI83unU1nQ/YYvypEhh9hM10Dsku/H9i7CB9hE2rx1LbG7zTZAn8Xg83h/G - xZ9C6y96BwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALwSURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFKEaNXigIWMAE + NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgQKWrZTSNhQDMpZF9i1hqUCXGehMeT0zrYAJiV/y5Fyc + eZ/M986I+Al8qI67UqxXhZXofwfJ9TQ5GYFS/jQwYcU6JuSZljov05QfDX9/QAjtneAnPZplC7NKURRn + tm3CbN1l1cLDYHjRgrwvs4gqGbGL05Ue7qhrQgu1yxRl4nTTDhhmWBhmWeinWWintqD+tYkWkw2bLNA4 + QiPv0wwSX1D0P5IgeQu9Yd9C/xyH73MsOVn0CZItdI9v4pvJTgRO9C9yMCw4UKCchf+DjndCOLLUb/KW + PHxbWnUDiZU3Udlah/z6UvjLveFHEBecQ6DiNMoay4RVrAyLpTU7AmO7WUEQUez/sWOoCU1jr1GpzxEk + sRUhyHkbg4y6KEiqryKhOgGNg0tooqz4+mMD66SnIEUPIwjE5WIPH3kmpx/twpshBYrU6YIkriqUhK8h + 5WUyNOM2YZX2MRoq0sOazYGg/F6XgJ/gwm4mqyYexnEtqg338bQtG5GllxBXEQ7jtB1GUixfsGbC1YmZ + CAIVewQXHskdZ3KPIKZcjP4JHQq6UqFQZiHqeQDq1J8xMM/CSIrVTTnQS1i2OOD/2C04KfOU+soOI6M2 + GrerghFddlmQZCljIKtPJm8SAP6+f5ZDH/+JCRZSpE+m1iXwlR2c95UdIg95wjfHE9eLApD2Kh4akwoF + qlykfoiHpCoCRiIwkH9DTwSMw0kE6t0VLmb2MIvrDAbnOYHu0QXcq0lBEglKq6OQXXt3547HvsURQcOu + gLfNmXcF/8PGr5C8R3A2q9Ou0g1u7/fwflDDo87jsY1Wd5wUmdI2ObNht3Tqh5yTKzQml2mMu1mxOgT4 + 5q0MhwFqxEnT9LrXneaf7rhIdCqlNc1H0tJ2Qqoy+0gbmB2SXHj/RdLAeEma144lNLd7xysTRSKR6A+3 + VJ80gqHE3AAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs index 853729f..cbf063d 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs @@ -31,6 +31,9 @@ this.components = new System.ComponentModel.Container(); this.dataGridView1 = new arCtl.arDatagridView(); this.panel1 = new System.Windows.Forms.Panel(); + this.chkExceptPak = new System.Windows.Forms.CheckBox(); + this.cmbUserList = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); this.cmbApploval = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); this.radTypeAll = new System.Windows.Forms.RadioButton(); @@ -69,11 +72,14 @@ this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1028, 663); + this.dataGridView1.Size = new System.Drawing.Size(1284, 663); this.dataGridView1.TabIndex = 2; // // panel1 // + this.panel1.Controls.Add(this.chkExceptPak); + this.panel1.Controls.Add(this.cmbUserList); + this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.cmbApploval); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.radTypeAll); @@ -90,9 +96,42 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1028, 36); + this.panel1.Size = new System.Drawing.Size(1284, 36); this.panel1.TabIndex = 3; // + // chkExceptPak + // + this.chkExceptPak.AutoSize = true; + this.chkExceptPak.Checked = true; + this.chkExceptPak.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkExceptPak.Location = new System.Drawing.Point(767, 11); + this.chkExceptPak.Name = "chkExceptPak"; + this.chkExceptPak.Size = new System.Drawing.Size(120, 16); + this.chkExceptPak.TabIndex = 17; + this.chkExceptPak.Text = "업무일지활성계정"; + this.chkExceptPak.UseVisualStyleBackColor = true; + // + // cmbUserList + // + this.cmbUserList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUserList.FormattingEnabled = true; + this.cmbUserList.Items.AddRange(new object[] { + "대상인원", + "전체인원"}); + this.cmbUserList.Location = new System.Drawing.Point(670, 9); + this.cmbUserList.Name = "cmbUserList"; + this.cmbUserList.Size = new System.Drawing.Size(85, 20); + this.cmbUserList.TabIndex = 16; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(635, 13); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(29, 12); + this.label3.TabIndex = 15; + this.label3.Text = "인원"; + // // cmbApploval // this.cmbApploval.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -118,7 +157,7 @@ // radTypeAll // this.radTypeAll.AutoSize = true; - this.radTypeAll.Location = new System.Drawing.Point(749, 11); + this.radTypeAll.Location = new System.Drawing.Point(1007, 11); this.radTypeAll.Name = "radTypeAll"; this.radTypeAll.Size = new System.Drawing.Size(78, 16); this.radTypeAll.TabIndex = 12; @@ -128,7 +167,7 @@ // radTypePMS // this.radTypePMS.AutoSize = true; - this.radTypePMS.Location = new System.Drawing.Point(693, 11); + this.radTypePMS.Location = new System.Drawing.Point(951, 11); this.radTypePMS.Name = "radTypePMS"; this.radTypePMS.Size = new System.Drawing.Size(50, 16); this.radTypePMS.TabIndex = 11; @@ -139,7 +178,7 @@ // this.radType.AutoSize = true; this.radType.Checked = true; - this.radType.Location = new System.Drawing.Point(637, 11); + this.radType.Location = new System.Drawing.Point(895, 11); this.radType.Name = "radType"; this.radType.Size = new System.Drawing.Size(47, 16); this.radType.TabIndex = 10; @@ -159,7 +198,7 @@ // button1 // this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(873, 5); + this.button1.Location = new System.Drawing.Point(1129, 5); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 26); this.button1.TabIndex = 8; @@ -198,7 +237,7 @@ // btRefresh // this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; - this.btRefresh.Location = new System.Drawing.Point(948, 5); + this.btRefresh.Location = new System.Drawing.Point(1204, 5); this.btRefresh.Name = "btRefresh"; this.btRefresh.Size = new System.Drawing.Size(75, 26); this.btRefresh.TabIndex = 2; @@ -234,7 +273,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1028, 699); + this.ClientSize = new System.Drawing.Size(1284, 699); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.panel1); this.Name = "rJobReportOT"; @@ -267,5 +306,8 @@ private System.Windows.Forms.RadioButton radTypeAll; private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox cmbApploval; + private System.Windows.Forms.ComboBox cmbUserList; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.CheckBox chkExceptPak; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs index ad9fba5..3cf39df 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs @@ -36,6 +36,8 @@ namespace FPJ0000.JobReport_ this.Show(); Application.DoEvents(); + cmbUserList.SelectedIndex = 0; + refrehData(); } @@ -73,7 +75,7 @@ namespace FPJ0000.JobReport_ this.dataGridView1.Columns.Add("공정", "공정"); this.dataGridView1.Columns.Add("이름", "이름"); this.dataGridView1.Columns.Add("사번", "사번"); - + //이름/년도데이터추가 var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm); @@ -84,7 +86,7 @@ namespace FPJ0000.JobReport_ var colname = drYm.yymm;//.Substring(0, 7); var yymm = drYm.yymm.Substring(0, 7); - + if (isReqData) { this.dataGridView1.Columns.Add(colname, yymm + "\n휴일"); @@ -127,8 +129,8 @@ namespace FPJ0000.JobReport_ this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 4].DefaultCellStyle.Format = "N1"; } - - + + } //사용자별 전체합계칸 @@ -155,15 +157,46 @@ namespace FPJ0000.JobReport_ this.dataGridView1.Columns.Add($"subtotal", $"합계\nPMS"); } - //이름으로 정렬해서 데이터를 가져온다 - var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname); - foreach (var uname in namelist) + bool allUsers = this.cmbUserList.SelectedIndex == 1; + + List users = new List(); + + //전체사람을 가져온다. + if (allUsers) { - var drName = uname.FirstOrDefault(); + users = FCOMMON.DBM.GetGroupUser(FCOMMON.info.Login.gcode); + } + else + { + //이름으로 정렬해서 데이터를 가져온다 + var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname); + foreach (var item in namelist) + { + var dr = item.FirstOrDefault(); + if (dr == null) continue; + users.Add(new FCOMMON.Models.GroupUserModel + { + email = string.Empty, + Gcode = string.Empty, + level = 1, + name = dr.uname, + Process = dr.UserProcess, + uid = dr.uid, + useJobReport = dr.useJobReport == 1, + useAccount = dr.useUserState == 1, + }); + } + } + + + foreach (var drName in users) + { + //var drName = uname.FirstOrDefault(); + if (chkExceptPak.Checked && drName.useJobReport == false) continue; List rowdata = new List(); - rowdata.Add(drName.UserProcess); - rowdata.Add(drName.uname); + rowdata.Add(drName.Process); + rowdata.Add(drName.name); rowdata.Add(drName.uid); double User_sumhlOne = 0; @@ -297,7 +330,7 @@ namespace FPJ0000.JobReport_ } //사용자별 합계정보 표시 - + if (User_sumhlOne == 0.0) rowdata.Add(null); else rowdata.Add($"{Math.Round(User_sumhlOne, 1)}"); //합계(휴일) @@ -306,7 +339,7 @@ namespace FPJ0000.JobReport_ if (isReqData == false && radTypeAll.Checked) { - + if (User_sumhlAll == 0.0) rowdata.Add(null); else rowdata.Add($"{Math.Round(User_sumhlAll, 1)}"); //합계(휴일-PMS) @@ -315,7 +348,7 @@ namespace FPJ0000.JobReport_ } - + dataGridView1.Rows.Add(rowdata.ToArray()); @@ -342,7 +375,7 @@ namespace FPJ0000.JobReport_ dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.WhiteSmoke; } - + continue; } else @@ -368,30 +401,48 @@ namespace FPJ0000.JobReport_ //총계추가 - + var rowcount = dataGridView1.Rows.Count; List rowdata2 = new List(); rowdata2.Add("합계"); - rowdata2.Add(dataGridView1.Rows.Count); + rowdata2.Add(rowcount); rowdata2.Add(null); //사번 + + double sumhrs = 0.0; for (int i = 3; i < this.dataGridView1.ColumnCount; i++) { var col = this.dataGridView1.Columns[i]; var colName = col.Name; var header = col.HeaderText; - if (col.HeaderText.EndsWith("%") == true ) + + //%열은 처리하지않는다. + if (col.HeaderText.EndsWith("%") == true) { - rowdata2.Add(null); + var hrstr = col.HeaderText.Substring(0, col.HeaderText.IndexOf('h')).Trim(); + if (float.TryParse(hrstr, out float hrs)) + { + rowdata2.Add($"{sumhrs/(hrs * rowcount)*100.0:N1}%"); + } + else + { + rowdata2.Add(null); + } + + sumhrs = 0f; continue; } - - var sum = 0.0; - for (int r = 0; r < this.dataGridView1.RowCount; r++) + else { - var cell = dataGridView1.Rows[r].Cells[i]; - if (cell.Value != null) sum += double.Parse(cell.Value.ToString()); + var sum = 0.0; + for (int r = 0; r < this.dataGridView1.RowCount; r++) + { + var cell = dataGridView1.Rows[r].Cells[i]; + if (cell.Value != null) sum += double.Parse(cell.Value.ToString()); + } + if (sum != 0.0) rowdata2.Add(sum); + else rowdata2.Add(null); + sumhrs += sum; } - if (sum != 0.0) rowdata2.Add(sum); - else rowdata2.Add(null); + } dataGridView1.Rows.Add(rowdata2.ToArray()); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.resx b/SubProject/FPJ0000/JobReport_/rJobReportOT.resx index 9b7b322..5755131 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.resx @@ -123,6 +123,9 @@ 79, 17 + + 79, 17 + 17, 17 diff --git a/SubProject/FPJ0000/Project/ctlLayout.cs b/SubProject/FPJ0000/Project/ctlLayout.cs index 4b2fa42..0c43844 100644 --- a/SubProject/FPJ0000/Project/ctlLayout.cs +++ b/SubProject/FPJ0000/Project/ctlLayout.cs @@ -115,6 +115,7 @@ namespace FPJ0000.Project var itemh = (rect.Height / rowcount) - (itemp * (rowcount - 1)); for (int i = 0; i < colcount; i++) { + // if (i >= 11) continue; for (int j = 0; j < rowcount; j++) { var r = new RectangleF( @@ -128,8 +129,13 @@ namespace FPJ0000.Project var data = items[cnt - 1]; var no = j * colcount + i + 1; - if (cnt == 12) continue; - + if (cnt >= 12) continue; + + if(no ==11) + { + cnt += 1; + continue; + } pe.Graphics.DrawRectangle(Pens.White, r.Left, r.Top, r.Width, r.Height); var rno = new RectangleF(r.Left, r.Top, 50f, 50f); diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 26fe7f1..c72c6ca 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -69,9 +69,9 @@ this.txReqUserName = new System.Windows.Forms.TextBox(); this.tbSdate = new System.Windows.Forms.TextBox(); this.tbEdate = new System.Windows.Forms.TextBox(); - this.usermainTextBox = new System.Windows.Forms.TextBox(); - this.usersubTextBox = new System.Windows.Forms.TextBox(); - this.userManagerTextBox = new System.Windows.Forms.TextBox(); + this.tbNameDesign = new System.Windows.Forms.TextBox(); + this.tbNameSw = new System.Windows.Forms.TextBox(); + this.tbNameChamp = new System.Windows.Forms.TextBox(); this.costoTextBox = new System.Windows.Forms.TextBox(); this.costnTextBox = new System.Windows.Forms.TextBox(); this.costeTextBox = new System.Windows.Forms.TextBox(); @@ -141,7 +141,7 @@ this.bsDesignID = new System.Windows.Forms.BindingSource(this.components); this.cmbChampion = new System.Windows.Forms.ComboBox(); this.bsChampionID = new System.Windows.Forms.BindingSource(this.components); - this.textBox3 = new System.Windows.Forms.TextBox(); + this.tbNameEPanel = new System.Windows.Forms.TextBox(); this.arLabel3 = new arCtl.arLabel(); this.bsAssembly = new System.Windows.Forms.BindingSource(this.components); this.panel2 = new System.Windows.Forms.Panel(); @@ -665,35 +665,35 @@ this.tbEdate.Size = new System.Drawing.Size(190, 21); this.tbEdate.TabIndex = 13; // - // usermainTextBox + // tbNameDesign // - this.usermainTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true)); - this.usermainTextBox.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.usermainTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usermainTextBox.Location = new System.Drawing.Point(342, 55); - this.usermainTextBox.Name = "usermainTextBox"; - this.usermainTextBox.Size = new System.Drawing.Size(104, 23); - this.usermainTextBox.TabIndex = 25; + this.tbNameDesign.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true)); + this.tbNameDesign.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbNameDesign.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbNameDesign.Location = new System.Drawing.Point(342, 55); + this.tbNameDesign.Name = "tbNameDesign"; + this.tbNameDesign.Size = new System.Drawing.Size(104, 23); + this.tbNameDesign.TabIndex = 25; // - // usersubTextBox + // tbNameSw // - this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true)); - this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usersubTextBox.Location = new System.Drawing.Point(342, 110); - this.usersubTextBox.Name = "usersubTextBox"; - this.usersubTextBox.Size = new System.Drawing.Size(104, 23); - this.usersubTextBox.TabIndex = 27; + this.tbNameSw.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true)); + this.tbNameSw.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbNameSw.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbNameSw.Location = new System.Drawing.Point(342, 110); + this.tbNameSw.Name = "tbNameSw"; + this.tbNameSw.Size = new System.Drawing.Size(104, 23); + this.tbNameSw.TabIndex = 27; // - // userManagerTextBox + // tbNameChamp // - this.userManagerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true)); - this.userManagerTextBox.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.userManagerTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.userManagerTextBox.Location = new System.Drawing.Point(342, 28); - this.userManagerTextBox.Name = "userManagerTextBox"; - this.userManagerTextBox.Size = new System.Drawing.Size(104, 23); - this.userManagerTextBox.TabIndex = 33; + this.tbNameChamp.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true)); + this.tbNameChamp.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbNameChamp.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbNameChamp.Location = new System.Drawing.Point(342, 28); + this.tbNameChamp.Name = "tbNameChamp"; + this.tbNameChamp.Size = new System.Drawing.Size(104, 23); + this.tbNameChamp.TabIndex = 33; // // costoTextBox // @@ -830,6 +830,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -1414,14 +1415,14 @@ this.panel5.Controls.Add(this.cmbDesign); this.panel5.Controls.Add(this.cmbChampion); this.panel5.Controls.Add(label8); - this.panel5.Controls.Add(this.textBox3); + this.panel5.Controls.Add(this.tbNameEPanel); this.panel5.Controls.Add(this.arLabel3); - this.panel5.Controls.Add(this.usersubTextBox); + this.panel5.Controls.Add(this.tbNameSw); this.panel5.Controls.Add(usersubLabel); this.panel5.Controls.Add(usermainLabel); - this.panel5.Controls.Add(this.usermainTextBox); + this.panel5.Controls.Add(this.tbNameDesign); this.panel5.Controls.Add(userManagerLabel); - this.panel5.Controls.Add(this.userManagerTextBox); + this.panel5.Controls.Add(this.tbNameChamp); this.panel5.Location = new System.Drawing.Point(6, 342); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(463, 156); @@ -1524,15 +1525,15 @@ this.bsChampionID.DataMember = "UserList"; this.bsChampionID.DataSource = this.dSComm; // - // textBox3 + // tbNameEPanel // - this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true)); - this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox3.Location = new System.Drawing.Point(342, 82); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(104, 23); - this.textBox3.TabIndex = 88; + this.tbNameEPanel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true)); + this.tbNameEPanel.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbNameEPanel.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbNameEPanel.Location = new System.Drawing.Point(342, 82); + this.tbNameEPanel.Name = "tbNameEPanel"; + this.tbNameEPanel.Size = new System.Drawing.Size(104, 23); + this.tbNameEPanel.TabIndex = 88; // // arLabel3 // @@ -2028,6 +2029,7 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; + this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -2754,6 +2756,7 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; + this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -2810,7 +2813,7 @@ this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); this.toolStripButton7.Name = "toolStripButton7"; this.toolStripButton7.RightToLeftAutoMirrorImage = true; - this.toolStripButton7.Size = new System.Drawing.Size(51, 22); + this.toolStripButton7.Size = new System.Drawing.Size(51, 20); this.toolStripButton7.Text = "삭제"; this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); // @@ -3137,9 +3140,9 @@ private System.Windows.Forms.TextBox txReqUserName; private System.Windows.Forms.TextBox tbSdate; private System.Windows.Forms.TextBox tbEdate; - private System.Windows.Forms.TextBox usermainTextBox; - private System.Windows.Forms.TextBox usersubTextBox; - private System.Windows.Forms.TextBox userManagerTextBox; + private System.Windows.Forms.TextBox tbNameDesign; + private System.Windows.Forms.TextBox tbNameSw; + private System.Windows.Forms.TextBox tbNameChamp; private System.Windows.Forms.TextBox costoTextBox; private System.Windows.Forms.TextBox costnTextBox; private System.Windows.Forms.TextBox costeTextBox; @@ -3201,7 +3204,7 @@ private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2; private System.Windows.Forms.ToolStripButton btSendMail; private System.Windows.Forms.ComboBox cmbReqTeam; - private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox tbNameEPanel; private System.Windows.Forms.ToolStripButton btwEdit; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.LinkLabel linkLabel1; diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 8132f25..3753511 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -14,8 +14,6 @@ namespace FPJ0000 dsPRJ.ProjectsRow dr = null; bool EditMode = false; - - public fProjectData(dsPRJ.ProjectsRow pidx_, bool editmode_ = true) { InitializeComponent(); @@ -28,7 +26,6 @@ namespace FPJ0000 this.chkHigh.Checked = pidx_.bHighlight; this.chkMajor.Checked = pidx_.bmajoritem; this.rtPanelImage.SizeMode = PictureBoxSizeMode.Zoom; - } protected override void OnFormClosed(FormClosedEventArgs e) { @@ -184,7 +181,7 @@ namespace FPJ0000 btMailAddr.Enabled = btPart.Enabled; btPath.Enabled = btPart.Enabled; btSendMail.Enabled = btPart.Enabled; - tbSFI.Text = dr.sfi.ToString("N2"); + tbSFI.Text = dr.sfic.ToString("N2"); if (dr.IspanelimageNull()) rtPanelImage.Image = null; else @@ -438,7 +435,7 @@ namespace FPJ0000 org = org.Replace("{pidx}", tbIdx.Text); org = org.Replace("{old}", oldsta); org = org.Replace("{new}", dr.status); - org = org.Replace("{champion}", userManagerTextBox.Text); + org = org.Replace("{champion}", tbNameChamp.Text); org = org.Replace("{sdate}", tbSdate.Text); org = org.Replace("{edate}", tbEdate.Text); org = org.Replace("{xdate}", tbDDate.Text); @@ -745,13 +742,9 @@ namespace FPJ0000 private void linkLabel11_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - int cnt; - if (int.TryParse(cntTextBox.Text, out cnt) == false) - { - FCOMMON.Util.MsgE($"수량이 입려되지 않았습니다"); - cntTextBox.Focus(); - return; - } + int cnt = 1; + if (dr.Issfi_countNull() == false) cnt = dr.sfi_count; + else int.TryParse(cntTextBox.Text, out cnt); var sfi_type = "O"; var sfi_count = 0D; @@ -768,6 +761,7 @@ namespace FPJ0000 { tbSFI.Text = f.Value.ToString("N2"); dr.sfi_type = f.radO.Checked ? "O" : "M"; + dr.sfi_count = (int)f.nudCnt.Value; //250904 if (f.radO.Checked) { dr.sfi = f.Value; //office 는 sfi와 sfic 가 동일하다 diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index c2f7757..2e206ba 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -223,7 +223,7 @@ namespace FPJ0000 "dbo.getUserName2(epanelid,userhw2) as name_epanel," + "dbo.getUserName2(softwareid,usersub) as name_software,category," + "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD," + - "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date,dbo.getLastProjectScheduleNo(gcode,idx) as lastSchNo,cramount,panelimage,Priority" + + "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date,dbo.getLastProjectScheduleNo(gcode,idx) as lastSchNo,cramount,panelimage,Priority,sfi_count" + " FROM Projects"; //string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects"; string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and "; diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 26f80bf..fee61d7 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1248,6 +1248,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnPriority; + private global::System.Data.DataColumn columnsfi_count; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public ProjectsDataTable() : @@ -2034,6 +2036,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sfi_countColumn { + get { + return this.columnsfi_count; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2163,7 +2173,8 @@ namespace FPJ0000 { int lastSchNo, decimal cramount, byte[] panelimage, - short Priority) { + short Priority, + int sfi_count) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2258,7 +2269,8 @@ namespace FPJ0000 { lastSchNo, cramount, panelimage, - Priority}; + Priority, + sfi_count}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2357,7 +2369,8 @@ namespace FPJ0000 { int lastSchNo, decimal cramount, byte[] panelimage, - short Priority) { + short Priority, + int sfi_count) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2452,7 +2465,8 @@ namespace FPJ0000 { lastSchNo, cramount, panelimage, - Priority}; + Priority, + sfi_count}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2575,6 +2589,7 @@ namespace FPJ0000 { this.columncramount = base.Columns["cramount"]; this.columnpanelimage = base.Columns["panelimage"]; this.columnPriority = base.Columns["Priority"]; + this.columnsfi_count = base.Columns["sfi_count"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2766,6 +2781,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnpanelimage); this.columnPriority = new global::System.Data.DataColumn("Priority", typeof(short), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnPriority); + this.columnsfi_count = new global::System.Data.DataColumn("sfi_count", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_count); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -15720,6 +15737,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int sfi_count { + get { + try { + return ((int)(this[this.tableProjects.sfi_countColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'sfi_count\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjects.sfi_countColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { @@ -16787,6 +16820,18 @@ namespace FPJ0000 { public void SetPriorityNull() { this[this.tableProjects.PriorityColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_countNull() { + return this.IsNull(this.tableProjects.sfi_countColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_countNull() { + this[this.tableProjects.sfi_countColumn] = global::System.Convert.DBNull; + } } /// @@ -27296,6 +27341,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("cramount", "cramount"); tableMapping.ColumnMappings.Add("panelimage", "panelimage"); tableMapping.ColumnMappings.Add("Priority", "Priority"); + tableMapping.ColumnMappings.Add("sfi_count", "sfi_count"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -27304,101 +27350,87 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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 [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqsta" + - "ff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userMan" + - "ager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remar" + - "k_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [ord" + - "erno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], " + - "[CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial]" + - ", [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid]," + - " [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [" + - "pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [" + - "sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic], [bm" + - "ajoritem], [cramount], [panelimage], [Priority]) 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, @category, @userprocess, @CMP_Background, @CMP_Description, @C" + - "MP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, " + - "@qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @us" + - "erAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin, @" + - "bHighlight, @effect_tangible, @effect_intangible, @sfi, @sfi_type, @sfi_savetime" + - ", @sfi_savecount, @sfi_shiftcount, @sfic, @bmajoritem, @cramount, @panelimage, @" + - "Priority)"; + 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, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, model, serial, + bdate, qdate, cdate, championid, designid, assemblyid, epanelid, softwareid, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, bHighlight, effect_tangible, + effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, cramount, panelimage, Priority, sfi_count) +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,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut,@div,@crdue,@model,@serial,@bdate,@qdate,@cdate,@championid,@designid,@assemblyid,@epanelid,@softwareid,@userAssembly,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic,@bmajoritem,@cramount,@panelimage,@Priority,@sfi_count)"; 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, 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("@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("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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.SmallDateTime, 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("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", 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("@costo", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, 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, 0, 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, 0, 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, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bmajoritem", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bmajoritem", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cramount", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 14, 3, "cramount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@panelimage", global::System.Data.SqlDbType.VarBinary, 0, global::System.Data.ParameterDirection.Input, 0, 0, "panelimage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Priority", global::System.Data.SqlDbType.SmallInt, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priority", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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, "", "", "")); + 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("@name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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.SmallDateTime, 4, 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("@rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "rev", 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("@userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", 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("@costo", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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("@asset", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bmajoritem", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bmajoritem", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cramount", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 14, 3, "cramount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@panelimage", global::System.Data.SqlDbType.VarBinary, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "panelimage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Priority", global::System.Data.SqlDbType.SmallInt, 2, global::System.Data.ParameterDirection.Input, 0, 0, "Priority", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_count", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_count", 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\r\nSET status = @status, pdate = @pdate, name = @name, userm" + @@ -27421,27 +27453,27 @@ namespace FPJ0000.dsPRJTableAdapters { "t_tangible, effect_intangible = @effect_intangible, sfi = @sfi, sfi_type = @sfi_" + "type, sfi_savetime = @sfi_savetime, \r\n sfi_savecount = @sfi_saveco" + "unt, sfi_shiftcount = @sfi_shiftcount, sfic = @sfic, bmajoritem = @bmajoritem, c" + - "ramount = @cramount, panelimage = @panelimage, Priority = @Priority\r\nWHERE (idx" + - " = @Original_idx); \r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaf" + - "f, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, " + - "process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, ass" + - "et, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode" + - ", category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After," + - " bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS" + - " wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, champ" + - "ionid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid," + - " epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUser" + - "Name(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo" + - ".getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_softw" + - "are, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, d" + - "bo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_int" + - "angible, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects" + - ".idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shif" + - "tcount, sfic, bmajoritem, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo," + - " cramount, panelimage, Priority FROM Projects WITH (nolock) WHERE (idx = @idx) O" + - "RDER 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)"; + "ramount = @cramount, panelimage = @panelimage, Priority = @Priority, \r\n " + + " sfi_count = @sfi_count\r\nWHERE (idx = @Original_idx); \r\nSELECT idx, statu" + + "s, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wd" + + "ate, 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, gcode, category, userprocess, CMP_Backgroun" + + "d, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getSc" + + "heduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd," + + " model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode," + + " idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName" + + "(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.get" + + "UserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel," + + " dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, R" + + "eqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistory" + + "D, bHighlight, effect_tangible, effect_intangible, (SELECT MAX(pdate) AS Expr1 F" + + "ROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_t" + + "ype, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, dbo.getLastP" + + "rojectScheduleNo(gcode, idx) AS lastSchNo, cramount, panelimage, Priority FROM P" + + "rojects WITH (nolock) WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THE" + + "N \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([sta" + + "tus] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.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, "", "", "")); this._adapter.UpdateCommand.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, "", "", "")); @@ -27516,6 +27548,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cramount", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 14, 3, "cramount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@panelimage", global::System.Data.SqlDbType.VarBinary, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "panelimage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Priority", global::System.Data.SqlDbType.SmallInt, 2, global::System.Data.ParameterDirection.Input, 0, 0, "Priority", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_count", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_count", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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.Original, false, null, "", "", "")); } @@ -27551,13 +27584,13 @@ namespace FPJ0000.dsPRJTableAdapters { "History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " + "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, db" + "o.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, \r\n cramount, " + - "panelimage, Priority\r\nFROM Projects WITH (nolock)\r\nWHERE (status LIKE @stat" + - "e) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n ISNULL(usermai" + - "n, \'\') LIKE @username OR\r\n ISNULL(usersub, \'\') LIKE @username) AND" + - " (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY (CASE WHEN [status] = \'검토" + - "\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN " + - "([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n THEN \'9\' ELSE" + - " \'5\' END)"; + "panelimage, Priority, sfi_count\r\nFROM Projects WITH (nolock)\r\nWHERE (status" + + " LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n ISN" + + "ULL(usermain, \'\') LIKE @username OR\r\n ISNULL(usersub, \'\') LIKE @us" + + "ername) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY (CASE WHEN [st" + + "atus] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THE" + + "N \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n TH" + + "EN \'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, "", "", "")); @@ -27569,31 +27602,43 @@ namespace FPJ0000.dsPRJTableAdapters { 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 CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)"; + this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, + bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, + dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, + pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, + userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, sfi_count +FROM Projects WITH (nolock) +WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].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, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getS" + - "cheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, as" + - "semblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate," + - " championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, ef" + - "fect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx)" + - " AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectSche" + - "duleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, (SELECT" + - " MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthi" + - "story_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assemb" + - "ly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS n" + - "ame_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid" + - ") AS name_software, odate, orderno, panelimage, part, path, pdate, pidx, pno, pr" + - "ocess, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sf" + - "i, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, stat" + - "us, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, w" + - "uid, \'\' AS wwd, \'\' AS wwe, \'\' AS wwo, \'\' AS wws FROM Projects WITH (nolock) WHER" + - "E (ISNULL(name, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcod" + - "e) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE" + - " @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N\'\') " + - "LIKE @search)"; + this._commandCollection[3].CommandText = "SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.get" + + "ScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, a" + + "ssemblyid, asset, bCost, \r\n bFanOut, bHighlight, bdate, bmajoritem" + + ", category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, design" + + "id, div, edate, effect_intangible, effect_tangible, epanelid, \r\n d" + + "bo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, ja" + + "smin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastH" + + "istory(idx) AS lasthistory,\r\n (SELECT MAX(pdate) AS Expr1\r\n " + + " FROM ProjectsHistory\r\n WHERE (pidx = P" + + "rojects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(ass" + + "emblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n " + + " dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS" + + " name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, pane" + + "limage, part, path, pdate, \r\n pidx, pno, process, progress, qdate," + + " remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_s" + + "avetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, \r\n " + + " userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, \'" + + "\' AS wwd, \'\' AS wwe, \'\' AS wwo, \'\' AS wws, sfi_count\r\nFROM Projects WITH (no" + + "lock)\r\nWHERE (ISNULL(name, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (g" + + "code = @gcode) OR\r\n (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AN" + + "D (CAST(idx AS varchar) LIKE @search) OR\r\n (ISNULL(isdel, 0) = 0) " + + "AND (gcode = @gcode) AND (ISNULL(memo, N\'\') LIKE @search)"; 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, "", "", "")); @@ -27869,7 +27914,8 @@ namespace FPJ0000.dsPRJTableAdapters { global::System.Nullable bmajoritem, global::System.Nullable cramount, byte[] panelimage, - global::System.Nullable Priority) { + global::System.Nullable Priority, + global::System.Nullable sfi_count) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -28303,6 +28349,12 @@ namespace FPJ0000.dsPRJTableAdapters { else { this.Adapter.InsertCommand.Parameters[72].Value = global::System.DBNull.Value; } + if ((sfi_count.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[73].Value = ((int)(sfi_count.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[73].Value = global::System.DBNull.Value; + } 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)) { @@ -28397,6 +28449,7 @@ namespace FPJ0000.dsPRJTableAdapters { global::System.Nullable cramount, byte[] panelimage, global::System.Nullable Priority, + global::System.Nullable sfi_count, int Original_idx, int idx) { if ((status == null)) { @@ -28832,8 +28885,14 @@ namespace FPJ0000.dsPRJTableAdapters { else { this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(idx)); + if ((sfi_count.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(sfi_count.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[75].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)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index c5903eb..02d6359 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -11,91 +11,97 @@ - + DELETE FROM Projects WHERE (idx = @Original_idx) - + - - 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], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic], [bmajoritem], [cramount], [panelimage], [Priority]) 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, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin, @bHighlight, @effect_tangible, @effect_intangible, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount, @sfic, @bmajoritem, @cramount, @panelimage, @Priority) + + 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, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, model, serial, + bdate, qdate, cdate, championid, designid, assemblyid, epanelid, softwareid, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, bHighlight, effect_tangible, + effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, cramount, panelimage, Priority, sfi_count) +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,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut,@div,@crdue,@model,@serial,@bdate,@qdate,@cdate,@championid,@designid,@assemblyid,@epanelid,@softwareid,@userAssembly,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic,@bmajoritem,@cramount,@panelimage,@Priority,@sfi_count) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -110,7 +116,7 @@ WHERE (idx = @Original_idx) (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, - cramount, panelimage, Priority + cramount, panelimage, Priority, sfi_count FROM Projects WITH (nolock) WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -135,8 +141,9 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin, bHighlight = @bHighlight, effect_tangible = @effect_tangible, effect_intangible = @effect_intangible, sfi = @sfi, sfi_type = @sfi_type, sfi_savetime = @sfi_savetime, - sfi_savecount = @sfi_savecount, sfi_shiftcount = @sfi_shiftcount, sfic = @sfic, bmajoritem = @bmajoritem, cramount = @cramount, panelimage = @panelimage, Priority = @Priority -WHERE (idx = @Original_idx); + sfi_savecount = @sfi_savecount, sfi_shiftcount = @sfi_shiftcount, sfic = @sfic, bmajoritem = @bmajoritem, cramount = @cramount, panelimage = @panelimage, Priority = @Priority, + sfi_count = @sfi_count +WHERE (idx = @Original_idx); 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, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, cramount, panelimage, Priority FROM Projects WITH (nolock) WHERE (idx = @idx) 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) @@ -212,6 +219,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -309,6 +317,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -331,7 +340,17 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, + bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, + dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, + pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, + userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, sfi_count +FROM Projects WITH (nolock) +WHERE (idx = @idx) @@ -341,7 +360,19 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, Priority, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, + bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, cramount, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, + dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, panelimage, part, path, pdate, + pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, + userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, sfi_count +FROM Projects WITH (nolock) +WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) @@ -3439,7 +3470,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3496,7 +3527,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3527,7 +3558,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3577,7 +3608,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3671,7 +3702,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3742,7 +3773,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -3771,35 +3802,35 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + - + - + - + @@ -3850,8 +3881,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -3860,21 +3891,21 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + - + @@ -3894,17 +3925,18 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + + - + @@ -3926,15 +3958,15 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - + + @@ -3948,8 +3980,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -3972,15 +4004,15 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - + + @@ -3993,7 +4025,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4014,7 +4046,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4086,7 +4118,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4104,37 +4136,37 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - - + + + - + - + - + - + @@ -4142,110 +4174,110 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - + @@ -4258,8 +4290,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -4295,21 +4327,21 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + - + @@ -4322,15 +4354,15 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - + @@ -4419,14 +4451,14 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + @@ -4441,7 +4473,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4489,17 +4521,17 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - - - + + + + @@ -4555,8 +4587,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -4657,7 +4689,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4712,53 +4744,53 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - - + + + - + - + - + - - + + - + - - + + @@ -4780,7 +4812,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4795,14 +4827,14 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + @@ -4820,8 +4852,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -4834,7 +4866,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -4946,23 +4978,23 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - - + + - + @@ -5025,8 +5057,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -5040,7 +5072,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5106,15 +5138,15 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - + @@ -5137,14 +5169,14 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + @@ -5172,17 +5204,17 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - + - + @@ -5201,14 +5233,14 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + @@ -5239,7 +5271,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5247,8 +5279,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -5270,22 +5302,22 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - + + - + @@ -5305,15 +5337,15 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - - + + @@ -5372,14 +5404,14 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + - + @@ -5430,8 +5462,8 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + @@ -5464,7 +5496,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5486,7 +5518,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5515,7 +5547,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5529,126 +5561,126 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - - + + - - - - - - - + + + + + + + - + - + - + - - + + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index ba1a3de..f5fe9fb 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,9 +4,9 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -18,11 +18,11 @@ - + - + - + diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index 70c77c8..471314f 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -618,6 +618,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnholyotPMS; + private global::System.Data.DataColumn columnuseJobReport; + + private global::System.Data.DataColumn columnuseUserState; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jobReportDataTable() { @@ -747,6 +751,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn useJobReportColumn { + get { + return this.columnuseJobReport; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn useUserStateColumn { + get { + return this.columnuseUserState; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -784,7 +804,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2, double otPMS, double holyotPMS) { + public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2, double otPMS, double holyotPMS, int useJobReport, int useUserState) { jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { yymm, @@ -798,7 +818,9 @@ namespace FPJ0000 { ot2, holyot2, otPMS, - holyotPMS}; + holyotPMS, + useJobReport, + useUserState}; rowjobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowjobReportRow); return rowjobReportRow; @@ -841,6 +863,8 @@ namespace FPJ0000 { this.columnholyot2 = base.Columns["holyot2"]; this.columnotPMS = base.Columns["otPMS"]; this.columnholyotPMS = base.Columns["holyotPMS"]; + this.columnuseJobReport = base.Columns["useJobReport"]; + this.columnuseUserState = base.Columns["useUserState"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -870,6 +894,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnotPMS); this.columnholyotPMS = new global::System.Data.DataColumn("holyotPMS", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnholyotPMS); + this.columnuseJobReport = new global::System.Data.DataColumn("useJobReport", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuseJobReport); + this.columnuseUserState = new global::System.Data.DataColumn("useUserState", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuseUserState); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnyymm, this.columnuid}, true)); @@ -4676,6 +4704,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int useJobReport { + get { + try { + return ((int)(this[this.tablejobReport.useJobReportColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'jobReport\' 테이블의 \'useJobReport\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablejobReport.useJobReportColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int useUserState { + get { + try { + return ((int)(this[this.tablejobReport.useUserStateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'jobReport\' 테이블의 \'useUserState\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablejobReport.useUserStateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IstotalNull() { @@ -4795,6 +4855,30 @@ namespace FPJ0000 { public void SetholyotPMSNull() { this[this.tablejobReport.holyotPMSColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsuseJobReportNull() { + return this.IsNull(this.tablejobReport.useJobReportColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetuseJobReportNull() { + this[this.tablejobReport.useJobReportColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsuseUserStateNull() { + return this.IsNull(this.tablejobReport.useUserStateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetuseUserStateNull() { + this[this.tablejobReport.useUserStateColumn] = global::System.Convert.DBNull; + } } /// @@ -7444,6 +7528,8 @@ namespace FPJ0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("holyot2", "holyot2"); tableMapping.ColumnMappings.Add("otPMS", "otPMS"); tableMapping.ColumnMappings.Add("holyotPMS", "holyotPMS"); + tableMapping.ColumnMappings.Add("useJobReport", "useJobReport"); + tableMapping.ColumnMappings.Add("useUserState", "useUserState"); this._adapter.TableMappings.Add(tableMapping); } @@ -7460,17 +7546,21 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPM" + - "S, holyotPMS\r\nFROM vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy)" + - " AND (gcode = @gcode) AND (ISNULL(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY " + - "yymm"; + this._commandCollection[0].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPMS, holyotPMS, useJobReport, useUserState +FROM vUserWorkTimeList +WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) +ORDER BY yymm"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", 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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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 UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm"; + this._commandCollection[1].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState +FROM vUserWorkTimeList +WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR + ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) +ORDER BY yymm"; 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("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7478,7 +7568,7 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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 UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm + this._commandCollection[2].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0 OR @@ -7492,7 +7582,11 @@ ORDER BY yymm"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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 UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm"; + this._commandCollection[3].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState +FROM vUserWorkTimeList +WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR + ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) +ORDER BY yymm"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; 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, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7500,7 +7594,7 @@ ORDER BY yymm"; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm + this._commandCollection[4].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot, 0) > 0 OR ISNULL(holyot, 0) > 0) AND (ISNULL(ot2, 0) = 0) AND (ISNULL(holyot2, 0) = 0) AND (ISNULL(otPMS, 0) = 0) AND (ISNULL(holyotPMS, 0) = 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index d41295d..c1a8d3c 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -12,7 +12,7 @@ - SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPMS, holyotPMS + SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPMS, holyotPMS, useJobReport, useUserState FROM vUserWorkTimeList WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) ORDER BY yymm @@ -38,12 +38,18 @@ ORDER BY yymm + + - SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState +FROM vUserWorkTimeList +WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR + ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) +ORDER BY yymm @@ -56,7 +62,7 @@ ORDER BY yymm - SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0 OR @@ -75,7 +81,11 @@ ORDER BY yymm - SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState +FROM vUserWorkTimeList +WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR + ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) +ORDER BY yymm @@ -88,7 +98,7 @@ ORDER BY yymm - SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm, useJobReport, useUserState FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot, 0) > 0 OR ISNULL(holyot, 0) > 0) AND (ISNULL(ot2, 0) = 0) AND (ISNULL(holyot2, 0) = 0) AND (ISNULL(otPMS, 0) = 0) AND (ISNULL(holyotPMS, 0) = 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @@ -496,28 +506,28 @@ ORDER BY ym - + - + - + - - + + - + @@ -538,13 +548,15 @@ ORDER BY ym + + - + - + @@ -558,7 +570,7 @@ ORDER BY ym - + @@ -584,17 +596,17 @@ ORDER BY ym - + - + - + @@ -625,7 +637,7 @@ ORDER BY ym - + @@ -637,10 +649,10 @@ ORDER BY ym - + - + @@ -656,21 +668,21 @@ ORDER BY ym - + - + - + - + @@ -771,8 +783,8 @@ ORDER BY ym - - + + @@ -781,17 +793,17 @@ ORDER BY ym - + - + - - - - + + + + @@ -799,7 +811,7 @@ ORDER BY ym - + @@ -818,7 +830,7 @@ ORDER BY ym - + @@ -836,10 +848,10 @@ ORDER BY ym - + - + @@ -855,7 +867,7 @@ ORDER BY ym - + @@ -940,17 +952,17 @@ ORDER BY ym - + - + - + diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index e79ad14..2f78bf8 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -13,9 +13,9 @@ + - \ No newline at end of file