...
This commit is contained in:
@@ -265,6 +265,12 @@
|
||||
<Compile Include="JobReport_\fJobChartMenu.Designer.cs">
|
||||
<DependentUpon>fJobChartMenu.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="JobReport_\rJobReportOT.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="JobReport_\rJobReportOT.Designer.cs">
|
||||
<DependentUpon>rJobReportOT.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="OtConfirm\fOTConfirm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -593,6 +599,9 @@
|
||||
<EmbeddedResource Include="JobReport_\fJobChartMenu.resx">
|
||||
<DependentUpon>fJobChartMenu.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="JobReport_\rJobReportOT.resx">
|
||||
<DependentUpon>rJobReportOT.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="OtConfirm\fOTConfirm.resx">
|
||||
<DependentUpon>fOTConfirm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
394
SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
generated
394
SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
generated
@@ -96,6 +96,7 @@
|
||||
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.lbStt = new System.Windows.Forms.ToolStripLabel();
|
||||
this.dtSD = new System.Windows.Forms.ToolStripTextBox();
|
||||
@@ -115,19 +116,19 @@
|
||||
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
|
||||
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
((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
|
||||
@@ -264,10 +265,9 @@
|
||||
//
|
||||
// btCopy
|
||||
//
|
||||
this.btCopy.Image = global::FPJ0000.Properties.Resources.copy;
|
||||
this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btCopy.Name = "btCopy";
|
||||
this.btCopy.Size = new System.Drawing.Size(67, 22);
|
||||
this.btCopy.Size = new System.Drawing.Size(51, 22);
|
||||
this.btCopy.Text = "복사(&C)";
|
||||
this.btCopy.Click += new System.EventHandler(this.btCopy_Click);
|
||||
//
|
||||
@@ -291,9 +291,8 @@
|
||||
//
|
||||
// btSave
|
||||
//
|
||||
this.btSave.Image = global::FPJ0000.Properties.Resources.action_save;
|
||||
this.btSave.Name = "btSave";
|
||||
this.btSave.Size = new System.Drawing.Size(66, 22);
|
||||
this.btSave.Size = new System.Drawing.Size(50, 22);
|
||||
this.btSave.Text = "저장(&S)";
|
||||
this.btSave.Click += new System.EventHandler(this.projectsBindingNavigatorSaveItem_Click);
|
||||
//
|
||||
@@ -553,191 +552,6 @@
|
||||
this.fpSpread1.StatusBarVisible = true;
|
||||
this.fpSpread1.TabIndex = 2;
|
||||
//
|
||||
// toolStrip1
|
||||
//
|
||||
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
|
||||
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.lbStt,
|
||||
this.dtSD,
|
||||
this.lbEnd,
|
||||
this.toolStripLabel4,
|
||||
this.dtED,
|
||||
this.lbTime,
|
||||
this.toolStripSeparator2,
|
||||
this.toolStripLabel1,
|
||||
this.tbProcess,
|
||||
this.toolStripButton4,
|
||||
this.toolStripLabel3,
|
||||
this.cmbUser,
|
||||
this.btSearch,
|
||||
this.toolStripButton2,
|
||||
this.toolStripButton6});
|
||||
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
|
||||
this.toolStrip1.Name = "toolStrip1";
|
||||
this.toolStrip1.Size = new System.Drawing.Size(1364, 37);
|
||||
this.toolStrip1.TabIndex = 4;
|
||||
this.toolStrip1.Text = "toolStrip1";
|
||||
//
|
||||
// lbStt
|
||||
//
|
||||
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.lbStt.ForeColor = System.Drawing.Color.Blue;
|
||||
this.lbStt.Name = "lbStt";
|
||||
this.lbStt.Size = new System.Drawing.Size(43, 34);
|
||||
this.lbStt.Text = "시작일";
|
||||
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
|
||||
//
|
||||
// dtSD
|
||||
//
|
||||
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtSD.Name = "dtSD";
|
||||
this.dtSD.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtSD.Text = "1982-11-23";
|
||||
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// lbEnd
|
||||
//
|
||||
this.lbEnd.Name = "lbEnd";
|
||||
this.lbEnd.Size = new System.Drawing.Size(15, 34);
|
||||
this.lbEnd.Text = "~";
|
||||
//
|
||||
// toolStripLabel4
|
||||
//
|
||||
this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
|
||||
this.toolStripLabel4.Name = "toolStripLabel4";
|
||||
this.toolStripLabel4.Size = new System.Drawing.Size(43, 34);
|
||||
this.toolStripLabel4.Text = "종료일";
|
||||
this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
|
||||
//
|
||||
// dtED
|
||||
//
|
||||
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtED.Name = "dtED";
|
||||
this.dtED.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtED.Text = "1982-11-23";
|
||||
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// lbTime
|
||||
//
|
||||
this.lbTime.Name = "lbTime";
|
||||
this.lbTime.Size = new System.Drawing.Size(29, 34);
|
||||
this.lbTime.Text = "{0}h";
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
|
||||
//
|
||||
// toolStripLabel1
|
||||
//
|
||||
this.toolStripLabel1.Name = "toolStripLabel1";
|
||||
this.toolStripLabel1.Size = new System.Drawing.Size(31, 34);
|
||||
this.toolStripLabel1.Text = "공정";
|
||||
//
|
||||
// tbProcess
|
||||
//
|
||||
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
|
||||
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.tbProcess.Name = "tbProcess";
|
||||
this.tbProcess.Size = new System.Drawing.Size(200, 37);
|
||||
//
|
||||
// toolStripButton4
|
||||
//
|
||||
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.accept;
|
||||
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton4.Name = "toolStripButton4";
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
|
||||
this.toolStripButton4.Text = "toolStripButton4";
|
||||
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
|
||||
//
|
||||
// toolStripLabel3
|
||||
//
|
||||
this.toolStripLabel3.Name = "toolStripLabel3";
|
||||
this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
|
||||
this.toolStripLabel3.Text = "사용자";
|
||||
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
|
||||
//
|
||||
// cmbUser
|
||||
//
|
||||
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbUser.Name = "cmbUser";
|
||||
this.cmbUser.Size = new System.Drawing.Size(200, 37);
|
||||
this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
|
||||
this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
|
||||
//
|
||||
// btSearch
|
||||
//
|
||||
this.btSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.태그자료만조회ToolStripMenuItem});
|
||||
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
|
||||
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btSearch.Name = "btSearch";
|
||||
this.btSearch.Size = new System.Drawing.Size(92, 34);
|
||||
this.btSearch.Text = "조회(&R)";
|
||||
this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick);
|
||||
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
|
||||
//
|
||||
// 태그자료만조회ToolStripMenuItem
|
||||
//
|
||||
this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
|
||||
this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
|
||||
this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
|
||||
this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripButton2
|
||||
//
|
||||
this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
|
||||
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton2.Name = "toolStripButton2";
|
||||
this.toolStripButton2.Size = new System.Drawing.Size(65, 34);
|
||||
this.toolStripButton2.Text = "닫기";
|
||||
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
|
||||
//
|
||||
// toolStripButton6
|
||||
//
|
||||
this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
|
||||
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton6.Name = "toolStripButton6";
|
||||
this.toolStripButton6.Size = new System.Drawing.Size(101, 34);
|
||||
this.toolStripButton6.Text = "미리보기창";
|
||||
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
|
||||
//
|
||||
// richTextBox1
|
||||
//
|
||||
this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro;
|
||||
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
|
||||
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
|
||||
this.richTextBox1.Name = "richTextBox1";
|
||||
this.richTextBox1.ReadOnly = true;
|
||||
this.richTextBox1.Size = new System.Drawing.Size(1364, 91);
|
||||
this.richTextBox1.TabIndex = 5;
|
||||
this.richTextBox1.Text = "";
|
||||
//
|
||||
// splitContainer1
|
||||
//
|
||||
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.splitContainer1.Location = new System.Drawing.Point(0, 37);
|
||||
this.splitContainer1.Name = "splitContainer1";
|
||||
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.fpSpread1);
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
//
|
||||
this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(1364, 693);
|
||||
this.splitContainer1.SplitterDistance = 592;
|
||||
this.splitContainer1.SplitterWidth = 10;
|
||||
this.splitContainer1.TabIndex = 6;
|
||||
//
|
||||
// fpSpread1_Sheet1
|
||||
//
|
||||
this.fpSpread1_Sheet1.Reset();
|
||||
@@ -857,7 +671,7 @@
|
||||
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(2021, 10, 13, 22, 53, 4, 0);
|
||||
dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 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;
|
||||
@@ -868,7 +682,7 @@
|
||||
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(2021, 10, 13, 22, 53, 4, 0);
|
||||
dateTimeCellType2.TimeDefault = new System.DateTime(2021, 12, 20, 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;
|
||||
@@ -905,6 +719,197 @@
|
||||
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);
|
||||
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.lbStt,
|
||||
this.dtSD,
|
||||
this.lbEnd,
|
||||
this.toolStripLabel4,
|
||||
this.dtED,
|
||||
this.lbTime,
|
||||
this.toolStripSeparator2,
|
||||
this.toolStripLabel1,
|
||||
this.tbProcess,
|
||||
this.toolStripButton4,
|
||||
this.toolStripSeparator3,
|
||||
this.toolStripLabel3,
|
||||
this.cmbUser,
|
||||
this.btSearch,
|
||||
this.toolStripButton2,
|
||||
this.toolStripButton6});
|
||||
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
|
||||
this.toolStrip1.Name = "toolStrip1";
|
||||
this.toolStrip1.Size = new System.Drawing.Size(1364, 37);
|
||||
this.toolStrip1.TabIndex = 4;
|
||||
this.toolStrip1.Text = "toolStrip1";
|
||||
//
|
||||
// lbStt
|
||||
//
|
||||
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.lbStt.ForeColor = System.Drawing.Color.Blue;
|
||||
this.lbStt.Name = "lbStt";
|
||||
this.lbStt.Size = new System.Drawing.Size(43, 34);
|
||||
this.lbStt.Text = "시작일";
|
||||
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
|
||||
//
|
||||
// dtSD
|
||||
//
|
||||
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtSD.Name = "dtSD";
|
||||
this.dtSD.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtSD.Text = "1982-11-23";
|
||||
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// lbEnd
|
||||
//
|
||||
this.lbEnd.Name = "lbEnd";
|
||||
this.lbEnd.Size = new System.Drawing.Size(15, 34);
|
||||
this.lbEnd.Text = "~";
|
||||
//
|
||||
// toolStripLabel4
|
||||
//
|
||||
this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
|
||||
this.toolStripLabel4.Name = "toolStripLabel4";
|
||||
this.toolStripLabel4.Size = new System.Drawing.Size(43, 34);
|
||||
this.toolStripLabel4.Text = "종료일";
|
||||
this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
|
||||
//
|
||||
// dtED
|
||||
//
|
||||
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtED.Name = "dtED";
|
||||
this.dtED.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtED.Text = "1982-11-23";
|
||||
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// lbTime
|
||||
//
|
||||
this.lbTime.Name = "lbTime";
|
||||
this.lbTime.Size = new System.Drawing.Size(29, 34);
|
||||
this.lbTime.Text = "{0}h";
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
|
||||
//
|
||||
// toolStripLabel1
|
||||
//
|
||||
this.toolStripLabel1.Name = "toolStripLabel1";
|
||||
this.toolStripLabel1.Size = new System.Drawing.Size(31, 34);
|
||||
this.toolStripLabel1.Text = "공정";
|
||||
//
|
||||
// tbProcess
|
||||
//
|
||||
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
|
||||
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.tbProcess.Name = "tbProcess";
|
||||
this.tbProcess.Size = new System.Drawing.Size(200, 37);
|
||||
//
|
||||
// toolStripButton4
|
||||
//
|
||||
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
|
||||
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton4.Name = "toolStripButton4";
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
|
||||
this.toolStripButton4.Text = "toolStripButton4";
|
||||
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
|
||||
//
|
||||
// toolStripLabel3
|
||||
//
|
||||
this.toolStripLabel3.Name = "toolStripLabel3";
|
||||
this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
|
||||
this.toolStripLabel3.Text = "사용자";
|
||||
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
|
||||
//
|
||||
// cmbUser
|
||||
//
|
||||
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbUser.Name = "cmbUser";
|
||||
this.cmbUser.Size = new System.Drawing.Size(200, 37);
|
||||
this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
|
||||
this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
|
||||
//
|
||||
// btSearch
|
||||
//
|
||||
this.btSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.태그자료만조회ToolStripMenuItem});
|
||||
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
|
||||
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btSearch.Name = "btSearch";
|
||||
this.btSearch.Size = new System.Drawing.Size(92, 34);
|
||||
this.btSearch.Text = "조회(&R)";
|
||||
this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick);
|
||||
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
|
||||
//
|
||||
// 태그자료만조회ToolStripMenuItem
|
||||
//
|
||||
this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
|
||||
this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
|
||||
this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
|
||||
this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripButton2
|
||||
//
|
||||
this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
|
||||
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton2.Name = "toolStripButton2";
|
||||
this.toolStripButton2.Size = new System.Drawing.Size(65, 34);
|
||||
this.toolStripButton2.Text = "닫기";
|
||||
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
|
||||
//
|
||||
// toolStripButton6
|
||||
//
|
||||
this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
|
||||
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton6.Name = "toolStripButton6";
|
||||
this.toolStripButton6.Size = new System.Drawing.Size(101, 34);
|
||||
this.toolStripButton6.Text = "미리보기창";
|
||||
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
|
||||
//
|
||||
// richTextBox1
|
||||
//
|
||||
this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro;
|
||||
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
|
||||
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
|
||||
this.richTextBox1.Name = "richTextBox1";
|
||||
this.richTextBox1.ReadOnly = true;
|
||||
this.richTextBox1.Size = new System.Drawing.Size(1364, 91);
|
||||
this.richTextBox1.TabIndex = 5;
|
||||
this.richTextBox1.Text = "";
|
||||
//
|
||||
// splitContainer1
|
||||
//
|
||||
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.splitContainer1.Location = new System.Drawing.Point(0, 37);
|
||||
this.splitContainer1.Name = "splitContainer1";
|
||||
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.fpSpread1);
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
//
|
||||
this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(1364, 693);
|
||||
this.splitContainer1.SplitterDistance = 592;
|
||||
this.splitContainer1.SplitterWidth = 10;
|
||||
this.splitContainer1.TabIndex = 6;
|
||||
//
|
||||
// toolStripSeparator3
|
||||
//
|
||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
|
||||
//
|
||||
// fJobReport
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
@@ -924,13 +929,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();
|
||||
|
||||
@@ -1004,5 +1009,6 @@
|
||||
private System.Windows.Forms.SplitContainer splitContainer1;
|
||||
private System.Windows.Forms.ToolStripButton toolStripButton6;
|
||||
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
|
||||
}
|
||||
}
|
||||
@@ -46,6 +46,11 @@ namespace FPJ0000
|
||||
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessUserListRow dr in dtUserList)
|
||||
{
|
||||
if (dr.outdate.isEmpty() == false)
|
||||
{
|
||||
var odt = DateTime.Parse(dr.outdate);
|
||||
if(odt <= DateTime.Now) continue; //퇴사자제외 211221
|
||||
}
|
||||
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
|
||||
this.cmbUser.Items.Add(cmbdata);
|
||||
}
|
||||
@@ -58,6 +63,11 @@ namespace FPJ0000
|
||||
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessUserListRow dr in dtUserList)
|
||||
{
|
||||
if (dr.outdate.isEmpty() == false)
|
||||
{
|
||||
var odt = DateTime.Parse(dr.outdate);
|
||||
if (odt <= DateTime.Now) continue; //퇴사자제외 211221
|
||||
}
|
||||
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
|
||||
this.cmbUser.Items.Add(cmbdata);
|
||||
}
|
||||
@@ -152,7 +162,7 @@ namespace FPJ0000
|
||||
col.Locked = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//210930-
|
||||
if (FCOMMON.info.NotShowJobReportview)
|
||||
@@ -496,15 +506,15 @@ namespace FPJ0000
|
||||
//FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
|
||||
//return;
|
||||
}
|
||||
else if(dr.ot > 0 && dr.ot2 > 0)
|
||||
else if (dr.ot > 0 && dr.ot2 > 0)
|
||||
{
|
||||
//util.MsgE("연장/휴일 근무가 관리자에의해 확정된 상태이므로 값을 변경할 수 없습니다");
|
||||
//ReadMod = true;
|
||||
}
|
||||
|
||||
|
||||
//ot데이터가잇고 관리자 확정되엇다면 처리하지 못한다
|
||||
|
||||
var f = new JobReport_.fJobReport_Add(dr,false,ReadMod);
|
||||
var f = new JobReport_.fJobReport_Add(dr, false, ReadMod);
|
||||
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
|
||||
{
|
||||
if (dr.RowState != DataRowState.Unchanged && ReadMod == false)
|
||||
@@ -583,7 +593,11 @@ namespace FPJ0000
|
||||
FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0)
|
||||
{
|
||||
FCOMMON.Util.MsgE("연장/휴일 근무 시간이 승인된 자료이므로 삭제할 수 없습니다");
|
||||
return;
|
||||
}
|
||||
var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?");
|
||||
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
|
||||
|
||||
|
||||
@@ -260,20 +260,20 @@
|
||||
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqioF6WpTQ3s
|
||||
Zipm3uYUr4kuDLLFNDIvoYkKFaIUvajQLjq1qbnN6YZbZJqpzdvUkdOl7nKO7pz57TlnSw2EfvDhefGc
|
||||
74fz+54j4CbkrjLxYrlWEVmh/R0q1VLkpHkquVNHR5YP0OGPNCNnJOrqQ1Gv9/ChnRP2oE9tsdHLRpOZ
|
||||
tTrWYbVvs2zjoPHDbEPRBxNiK8acwmz5Xm/UMxGlGsvM/C92YMYF3SwDnYmBdoaBZnoDyp/r6Bh1YJ0B
|
||||
WscoFL2bRcqTEeofSai0g1pzbsAwx+LLHENOBoO8ZAMq4zo+jTqJwA2DmYVuwYUSuQlBd3pe8eGYysCp
|
||||
69KoTXHdVaTUXkNtZxOKmysRJPVDIEFYchohshOoaq3iV7HTDBZXnAjJUjG8ILo86G3PcBvaJp6jVlvA
|
||||
SxJqwlHwMh45TbEQ1V9Ccn0yWocW0TZix8dva1glPYXK+mheIKwW7g2U5rLa8V68GJahTJnNSxLrIkj4
|
||||
MtKfpkFtdPCrdE9QUJAeVhwuhBb3ewTchJWq6LyGJOiNGtTrbuNhVz5iKs8jsSYK+hkn9KRYrmD1pKcT
|
||||
KxGEyHYIzt6Tuk4WHkR8tRCGyQGU9GZAJs9D7ONgNCnf4+s8Az0pdmDahX6CxeZC0H2v4JjERxwgOYCc
|
||||
xjjcqAtDXNUFXpInj4ekOY28STC4e4OJxSD3iQk2UqR/rsYjCJDsmw+Q7CcP+SCgwAdXyoKR+SwJ6lEF
|
||||
ShSFyHiTBFFdNPREoCP/hpYIaJebCJTbK5zL7aPNqzSG5lke1fgCbjWkI5UExfWxyG/M2rrjcG6wRNCy
|
||||
LeBsc9Ztwf9wcCuk7RCcyvvsNIzPbe728G6YF5fcRxJa7d44KTK9a2p2zWkzTCy4p5YoTFkoGL0s2V08
|
||||
XPN2moXJbHFTFLXqe7P9uzcuEBxP78z0F3V0HRUrrP7iFnqLVA9+fxG10L6i9pXDye3dfknyFIFAIPgD
|
||||
rY6gfdVzOrEAAAAASUVORK5CYII=
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRL1JTmxrY
|
||||
zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5pzTjeckWnmXTed5XSpu5yjO2d+e87ZUgOhH3x4Xjzn
|
||||
++H8vucIuAm6q4q/UKJVhpdqfwfLtBQ5aZ4y7tTR4SV9dOgjzfAZqbriUMTrPXxo54Q86FGbrfTyhMHE
|
||||
WuzrsNi2WbZy0PixYEX+ByOiS0cdogzFXk/UPWFFGvPM3E+2b9YJnYGBzshAO8tAM7MB1cQ6WkfsWGeA
|
||||
plEK+e8MSHoyTP0jCZa1UmuODQzMsfgyx5CTQT8v2UD35Do+jTiIwIWBBRY6kxOFCiMC7nS+4sNRZf7T
|
||||
12QRm5LqK0iquoqqtnoUNJQhQOYDf4Ko8DSC5CdQ3lTOr2KjGSyuOBCU3s3wgsiSgLedQ81oHn+OKm0u
|
||||
L4mrDEXuy1hk1kdDXHMRiTWJaBpcRPOwDR+/rWGV9BQs76F5gahCtNdPlsVqx7rwYkiOYlUGL4mvDiPh
|
||||
S0h9mgL1pJ1fpWOcgpL0sGJ3Irig1y3gJqSom86uTYB+UoMa3W08bM9BVNk5xFdGQD/rgJ4UyxWsnnJ3
|
||||
YiGCIPkOwdl7MufJvIOIrRBhYKoPhV1pkCuyEf04EPWq9/g6z0BPiu2bcaKXYLY6EXDfIzgm9ZIIpQeQ
|
||||
WReD69UhiCk/z0uyFbGQNqSQNwkEdz9gZNHPfWKClRTpm6VxC4TSffNC6X7ykBeEuV64XByI9GcJUI8o
|
||||
UajMQ9qbBIirI6EnAh35N7REQDtdRKDaXsEvq4deWKUxOM/ydI+ZcKs2FckkKKmJRk7dza07DscGSwSN
|
||||
2wLONmfZFvwPO7dCyg7BqezPDv2ocXO3h3fD9MvsOhLXZPPESZGp7dOGNYdVPzbvml6iMG2mMOlhyebk
|
||||
4Zq30SwMpkUXRVGr3jdavnviAsHx1LZ0X3Fr+1GJ0uIraaS3SHbj8xdxI+0tblk5nNjS4ZOgSBIIBII/
|
||||
jEqgaRqp4qMAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@@ -377,6 +377,19 @@
|
||||
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>393, 17</value>
|
||||
</metadata>
|
||||
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGJSURBVEhL7ZS9TsQwEITzeoBo4Dko6eiRDpAQ4i0oqWg5
|
||||
aICXoKKjpTQMmgkTs+tLQuhupJHXPzuffYqu22qszta7BeZ0eUXhgsLnD3u/9lf3O3+/kENghPocYKyt
|
||||
uKc52+fLIZF72FctaPQrTBJCIpjbYT7CjJkmNUcwt8Nmw3EwCm+5BUU9+hJReMsOw3jxuF9u347L9fPh
|
||||
YJ3xuaLwlv1FgN69n5SXclnWH6fl6umg32d8rii8ZX+poDBqrP3rizMo9ka9OAre5NZLZcBxlpih/ICM
|
||||
NYToY/E9OIWyV69VLmrifqTDHowGBeNjcXjrpehzqI/EDfUNJ1CHb16P+nDBM2gG00hMrKiphi/2Ulfd
|
||||
pNrhGRRj3a+R8bnqJq8d7j+v93itfpxjfC5vwugfGwy4oJhHoKif8bFwsA5So4w1QTX3nqwfNTFt4aA3
|
||||
Zq5BGmXGTRMaI5jbYfXImHmqA2sw1qJ9ts+XQhGGUbWstfqfj+3zFYUoHMbFuNwLF2C5vATmdKsN6rpP
|
||||
fZjWUaDH7j0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
|
||||
190
SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs
generated
Normal file
190
SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs
generated
Normal file
@@ -0,0 +1,190 @@
|
||||
namespace FPJ0000.JobReport_
|
||||
{
|
||||
partial class rJobReportOT
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.bs = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsReport = new FPJ0000.dsReport();
|
||||
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
|
||||
this.dataGridView1 = new arCtl.arDatagridView();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.tbProcess = new System.Windows.Forms.ComboBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
|
||||
this.btRefresh = new System.Windows.Forms.Button();
|
||||
this.tbMon = new System.Windows.Forms.TextBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
|
||||
this.panel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// bs
|
||||
//
|
||||
this.bs.DataMember = "jobreport";
|
||||
this.bs.DataSource = this.dsReport;
|
||||
//
|
||||
// dsReport
|
||||
//
|
||||
this.dsReport.DataSetName = "dsReport";
|
||||
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
|
||||
//
|
||||
// ta
|
||||
//
|
||||
this.ta.ClearBeforeFill = true;
|
||||
//
|
||||
// dataGridView1
|
||||
//
|
||||
this.dataGridView1.A_DelCurrentCell = true;
|
||||
this.dataGridView1.A_EnterToTab = true;
|
||||
this.dataGridView1.A_KoreanField = null;
|
||||
this.dataGridView1.A_UpperField = null;
|
||||
this.dataGridView1.A_ViewRownumOnHeader = true;
|
||||
this.dataGridView1.AllowUserToAddRows = false;
|
||||
this.dataGridView1.AllowUserToDeleteRows = false;
|
||||
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
|
||||
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
|
||||
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dataGridView1.Location = new System.Drawing.Point(0, 42);
|
||||
this.dataGridView1.Name = "dataGridView1";
|
||||
this.dataGridView1.ReadOnly = true;
|
||||
this.dataGridView1.RowTemplate.Height = 23;
|
||||
this.dataGridView1.Size = new System.Drawing.Size(1348, 657);
|
||||
this.dataGridView1.TabIndex = 2;
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Controls.Add(this.button1);
|
||||
this.panel1.Controls.Add(this.tbProcess);
|
||||
this.panel1.Controls.Add(this.label1);
|
||||
this.panel1.Controls.Add(this.linkLabel1);
|
||||
this.panel1.Controls.Add(this.btRefresh);
|
||||
this.panel1.Controls.Add(this.tbMon);
|
||||
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
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(1348, 42);
|
||||
this.panel1.TabIndex = 3;
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.button1.Location = new System.Drawing.Point(1193, 5);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(75, 32);
|
||||
this.button1.TabIndex = 8;
|
||||
this.button1.Text = "내보내기";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// tbProcess
|
||||
//
|
||||
this.tbProcess.FormattingEnabled = true;
|
||||
this.tbProcess.Location = new System.Drawing.Point(222, 10);
|
||||
this.tbProcess.Name = "tbProcess";
|
||||
this.tbProcess.Size = new System.Drawing.Size(158, 20);
|
||||
this.tbProcess.TabIndex = 7;
|
||||
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(187, 15);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(29, 12);
|
||||
this.label1.TabIndex = 6;
|
||||
this.label1.Text = "공정";
|
||||
//
|
||||
// linkLabel1
|
||||
//
|
||||
this.linkLabel1.AutoSize = true;
|
||||
this.linkLabel1.Location = new System.Drawing.Point(13, 15);
|
||||
this.linkLabel1.Name = "linkLabel1";
|
||||
this.linkLabel1.Size = new System.Drawing.Size(45, 12);
|
||||
this.linkLabel1.TabIndex = 0;
|
||||
this.linkLabel1.TabStop = true;
|
||||
this.linkLabel1.Text = "조회 년";
|
||||
//
|
||||
// btRefresh
|
||||
//
|
||||
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.btRefresh.Location = new System.Drawing.Point(1268, 5);
|
||||
this.btRefresh.Name = "btRefresh";
|
||||
this.btRefresh.Size = new System.Drawing.Size(75, 32);
|
||||
this.btRefresh.TabIndex = 2;
|
||||
this.btRefresh.Text = "새로고침";
|
||||
this.btRefresh.UseVisualStyleBackColor = true;
|
||||
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
|
||||
//
|
||||
// tbMon
|
||||
//
|
||||
this.tbMon.Location = new System.Drawing.Point(66, 10);
|
||||
this.tbMon.Name = "tbMon";
|
||||
this.tbMon.Size = new System.Drawing.Size(115, 21);
|
||||
this.tbMon.TabIndex = 1;
|
||||
this.tbMon.Text = "2020";
|
||||
this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
|
||||
//
|
||||
// rJobReportOT
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(1348, 699);
|
||||
this.Controls.Add(this.dataGridView1);
|
||||
this.Controls.Add(this.panel1);
|
||||
this.Name = "rJobReportOT";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "휴일/연장근무 집계표";
|
||||
this.Load += new System.EventHandler(this.rJobReport_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.panel1.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
private System.Windows.Forms.BindingSource bs;
|
||||
private dsReport dsReport;
|
||||
private dsReportTableAdapters.jobReportTableAdapter ta;
|
||||
private arCtl.arDatagridView dataGridView1;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.LinkLabel linkLabel1;
|
||||
private System.Windows.Forms.Button btRefresh;
|
||||
private System.Windows.Forms.TextBox tbMon;
|
||||
private System.Windows.Forms.ComboBox tbProcess;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Button button1;
|
||||
}
|
||||
}
|
||||
148
SubProject/FPJ0000/JobReport_/rJobReportOT.cs
Normal file
148
SubProject/FPJ0000/JobReport_/rJobReportOT.cs
Normal file
@@ -0,0 +1,148 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace FPJ0000.JobReport_
|
||||
{
|
||||
public partial class rJobReportOT : Form
|
||||
{
|
||||
public rJobReportOT()
|
||||
{
|
||||
InitializeComponent();
|
||||
//this.WindowState = FormWindowState.Maximized;
|
||||
}
|
||||
|
||||
private void rJobReport_Load(object sender, EventArgs e)
|
||||
{
|
||||
this.tbProcess.Items.Clear();
|
||||
tbProcess.Items.Add("전체");
|
||||
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
|
||||
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
|
||||
tbProcess.Items.Add(dr.processs);
|
||||
|
||||
//this.tbProcess.Text = FCOMMON.info.Login.process;
|
||||
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
|
||||
|
||||
this.tbMon.Text = DateTime.Now.Year.ToString();
|
||||
this.Show();
|
||||
Application.DoEvents();
|
||||
|
||||
refrehData();
|
||||
}
|
||||
|
||||
void refrehData()
|
||||
{
|
||||
////휴일데이터가 들어가 있음.
|
||||
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
|
||||
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
|
||||
|
||||
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
|
||||
this.ta.FillByOt2(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
|
||||
|
||||
|
||||
//그리드뷰 생성
|
||||
this.dataGridView1.AllowUserToAddRows = false;
|
||||
this.dataGridView1.AllowUserToDeleteRows = false;
|
||||
this.dataGridView1.Rows.Clear();
|
||||
this.dataGridView1.Columns.Clear();
|
||||
this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
|
||||
this.dataGridView1.ColumnHeadersHeight = 35;
|
||||
this.dataGridView1.Columns.Add("공정", "공정");
|
||||
this.dataGridView1.Columns.Add("이름", "이름");
|
||||
|
||||
//이름/년도데이터추가
|
||||
var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
|
||||
foreach (var ym in ymlist)
|
||||
{
|
||||
var drYm = ym.FirstOrDefault();
|
||||
var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
|
||||
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\r\n(" + basehr.ToString() + ")");
|
||||
}
|
||||
|
||||
//이름으로 정렬해서 데이터를 가져온다
|
||||
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
|
||||
foreach (var uname in namelist)
|
||||
{
|
||||
var drName = uname.FirstOrDefault();
|
||||
|
||||
List<string> rowdata = new List<string>();
|
||||
rowdata.Add(drName.UserProcess);
|
||||
rowdata.Add(drName.uname + "(" + drName.uid + ")");
|
||||
|
||||
List<Boolean> high = new List<bool>();
|
||||
List<Boolean> low = new List<bool>();
|
||||
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
|
||||
{
|
||||
var coltitle = dataGridView1.Columns[i].HeaderText;
|
||||
var basehr = int.Parse(coltitle.Split('\n')[1].Replace("(", "").Replace(")", ""));
|
||||
|
||||
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == dataGridView1.Columns[i].Name);
|
||||
if (userDatas == null || userDatas.Count() == 0)
|
||||
{
|
||||
//이달에는 데이터가없다
|
||||
rowdata.Add("--");
|
||||
high.Add(false);
|
||||
low.Add(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
|
||||
//var sumhr = 0f;
|
||||
//var sumot = 0f;
|
||||
//var sumholy = 0f;
|
||||
//foreach(dsReport.jobReportRow item in userDatas)
|
||||
//{
|
||||
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
|
||||
//}
|
||||
|
||||
var sumhr = userDatas.Sum(t => t.hrs);
|
||||
var sumot = userDatas.Sum(t => t.ot2);
|
||||
var sumhl = userDatas.Sum(t => t.holyot2);
|
||||
|
||||
rowdata.Add($"휴일({sumhl})\r\n연장({sumot})");
|
||||
|
||||
if (sumhr > basehr) high.Add(true);
|
||||
else high.Add(false);
|
||||
|
||||
if (sumhr < basehr) low.Add(true);
|
||||
else low.Add(false);
|
||||
}
|
||||
}
|
||||
|
||||
dataGridView1.Rows.Add(rowdata.ToArray());
|
||||
|
||||
//이번에 추가한 줄의 셀 컬러를 지정한다
|
||||
var currentrow = dataGridView1.Rows.Count - 1;
|
||||
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
|
||||
{
|
||||
if (high[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
|
||||
else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
|
||||
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
|
||||
}
|
||||
}
|
||||
this.dataGridView1.AutoResizeColumns();
|
||||
|
||||
}
|
||||
|
||||
private void btRefresh_Click(object sender, EventArgs e)
|
||||
{
|
||||
refrehData();
|
||||
}
|
||||
|
||||
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (tbProcess.SelectedIndex >= 0) refrehData();
|
||||
}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
dataGridView1.ExportData(string.Empty);
|
||||
}
|
||||
}
|
||||
}
|
||||
129
SubProject/FPJ0000/JobReport_/rJobReportOT.resx
Normal file
129
SubProject/FPJ0000/JobReport_/rJobReportOT.resx
Normal file
@@ -0,0 +1,129 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>181, 17</value>
|
||||
</metadata>
|
||||
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>79, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
102
SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
generated
102
SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
generated
@@ -30,14 +30,14 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm));
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
|
||||
this.bs = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsMSSQL = new FPJ0000.dsPRJ();
|
||||
@@ -91,6 +91,7 @@
|
||||
this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
|
||||
this.bn.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
|
||||
@@ -183,7 +184,6 @@
|
||||
//
|
||||
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";
|
||||
@@ -226,7 +226,6 @@
|
||||
// tbFind
|
||||
//
|
||||
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.tbFind.Name = "tbFind";
|
||||
this.tbFind.Size = new System.Drawing.Size(100, 25);
|
||||
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
|
||||
@@ -244,12 +243,11 @@
|
||||
// toolStripButton5
|
||||
//
|
||||
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripButton5.Enabled = false;
|
||||
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
|
||||
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton5.Name = "toolStripButton5";
|
||||
this.toolStripButton5.Size = new System.Drawing.Size(63, 22);
|
||||
this.toolStripButton5.Text = "보고서";
|
||||
this.toolStripButton5.Size = new System.Drawing.Size(144, 22);
|
||||
this.toolStripButton5.Text = "휴일/연장근무 집계표";
|
||||
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
|
||||
//
|
||||
@@ -316,6 +314,7 @@
|
||||
this.toolStripLabel1,
|
||||
this.tbProcess,
|
||||
this.toolStripButton4,
|
||||
this.toolStripSeparator3,
|
||||
this.toolStripLabel3,
|
||||
this.cmbUser,
|
||||
this.btSearch,
|
||||
@@ -338,7 +337,6 @@
|
||||
// dtSD
|
||||
//
|
||||
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtSD.Name = "dtSD";
|
||||
this.dtSD.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtSD.Text = "1982-11-23";
|
||||
@@ -362,7 +360,6 @@
|
||||
// dtED
|
||||
//
|
||||
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.dtED.Name = "dtED";
|
||||
this.dtED.Size = new System.Drawing.Size(90, 37);
|
||||
this.dtED.Text = "1982-11-23";
|
||||
@@ -390,14 +387,15 @@
|
||||
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
|
||||
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
|
||||
this.tbProcess.Name = "tbProcess";
|
||||
this.tbProcess.Size = new System.Drawing.Size(350, 37);
|
||||
this.tbProcess.Size = new System.Drawing.Size(300, 37);
|
||||
//
|
||||
// toolStripButton4
|
||||
//
|
||||
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
|
||||
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.toolStripButton4.Name = "toolStripButton4";
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(23, 34);
|
||||
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
|
||||
this.toolStripButton4.Text = "toolStripButton4";
|
||||
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
|
||||
//
|
||||
@@ -507,19 +505,19 @@
|
||||
// pdateDataGridViewTextBoxColumn
|
||||
//
|
||||
this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
|
||||
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
|
||||
dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle41;
|
||||
this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜";
|
||||
this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
|
||||
this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.pdateDataGridViewTextBoxColumn.Width = 54;
|
||||
this.pdateDataGridViewTextBoxColumn.Width = 51;
|
||||
//
|
||||
// wwDataGridViewTextBoxColumn
|
||||
//
|
||||
this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww";
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
|
||||
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
|
||||
dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
|
||||
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle42;
|
||||
this.wwDataGridViewTextBoxColumn.HeaderText = "WW";
|
||||
this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn";
|
||||
this.wwDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
@@ -531,7 +529,7 @@
|
||||
this.usernameDataGridViewTextBoxColumn.HeaderText = "담당";
|
||||
this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn";
|
||||
this.usernameDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.usernameDataGridViewTextBoxColumn.Width = 54;
|
||||
this.usernameDataGridViewTextBoxColumn.Width = 51;
|
||||
//
|
||||
// requestpartDataGridViewTextBoxColumn
|
||||
//
|
||||
@@ -539,7 +537,7 @@
|
||||
this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서";
|
||||
this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn";
|
||||
this.requestpartDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.requestpartDataGridViewTextBoxColumn.Width = 78;
|
||||
this.requestpartDataGridViewTextBoxColumn.Width = 61;
|
||||
//
|
||||
// packageDataGridViewTextBoxColumn
|
||||
//
|
||||
@@ -547,17 +545,17 @@
|
||||
this.packageDataGridViewTextBoxColumn.HeaderText = "패키지";
|
||||
this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn";
|
||||
this.packageDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.packageDataGridViewTextBoxColumn.Width = 66;
|
||||
this.packageDataGridViewTextBoxColumn.Width = 61;
|
||||
//
|
||||
// statusDataGridViewTextBoxColumn
|
||||
//
|
||||
this.statusDataGridViewTextBoxColumn.DataPropertyName = "status";
|
||||
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle43;
|
||||
this.statusDataGridViewTextBoxColumn.HeaderText = "상태";
|
||||
this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn";
|
||||
this.statusDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.statusDataGridViewTextBoxColumn.Width = 54;
|
||||
this.statusDataGridViewTextBoxColumn.Width = 51;
|
||||
//
|
||||
// svalueDataGridViewTextBoxColumn
|
||||
//
|
||||
@@ -565,7 +563,7 @@
|
||||
this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류";
|
||||
this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
|
||||
this.svalueDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.svalueDataGridViewTextBoxColumn.Width = 78;
|
||||
this.svalueDataGridViewTextBoxColumn.Width = 61;
|
||||
//
|
||||
// projectNameDataGridViewTextBoxColumn
|
||||
//
|
||||
@@ -578,11 +576,11 @@
|
||||
// otDataGridViewTextBoxColumn
|
||||
//
|
||||
this.otDataGridViewTextBoxColumn.DataPropertyName = "ot";
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Red;
|
||||
dataGridViewCellStyle4.Format = "N1";
|
||||
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
|
||||
dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
|
||||
dataGridViewCellStyle44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Red;
|
||||
dataGridViewCellStyle44.Format = "N1";
|
||||
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle44;
|
||||
this.otDataGridViewTextBoxColumn.HeaderText = "초과";
|
||||
this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn";
|
||||
this.otDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
@@ -591,10 +589,10 @@
|
||||
// ot2DataGridViewTextBoxColumn
|
||||
//
|
||||
this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2";
|
||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle5.Format = "N1";
|
||||
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle45.Format = "N1";
|
||||
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle45;
|
||||
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인";
|
||||
this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn";
|
||||
this.ot2DataGridViewTextBoxColumn.Width = 51;
|
||||
@@ -602,8 +600,8 @@
|
||||
// otReasonDataGridViewTextBoxColumn
|
||||
//
|
||||
this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason";
|
||||
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
||||
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
dataGridViewCellStyle46.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
||||
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle46;
|
||||
this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유";
|
||||
this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn";
|
||||
this.otReasonDataGridViewTextBoxColumn.Width = 51;
|
||||
@@ -611,10 +609,10 @@
|
||||
// otStartDataGridViewTextBoxColumn
|
||||
//
|
||||
this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart";
|
||||
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle7.Format = "HH:mm:ss";
|
||||
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
|
||||
dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle47.Format = "HH:mm:ss";
|
||||
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle47;
|
||||
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
|
||||
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
|
||||
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
@@ -623,10 +621,10 @@
|
||||
// otEnd
|
||||
//
|
||||
this.otEnd.DataPropertyName = "otEnd";
|
||||
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle8.Format = "HH:mm:ss";
|
||||
this.otEnd.DefaultCellStyle = dataGridViewCellStyle8;
|
||||
dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
||||
dataGridViewCellStyle48.Format = "HH:mm:ss";
|
||||
this.otEnd.DefaultCellStyle = dataGridViewCellStyle48;
|
||||
this.otEnd.HeaderText = "종료";
|
||||
this.otEnd.Name = "otEnd";
|
||||
this.otEnd.ReadOnly = true;
|
||||
@@ -640,6 +638,11 @@
|
||||
this.descriptionDataGridViewTextBoxColumn.ReadOnly = true;
|
||||
this.descriptionDataGridViewTextBoxColumn.Width = 51;
|
||||
//
|
||||
// toolStripSeparator3
|
||||
//
|
||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
|
||||
//
|
||||
// fOTConfirm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
||||
@@ -724,5 +727,6 @@
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn otEnd;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
|
||||
}
|
||||
}
|
||||
@@ -32,6 +32,91 @@ namespace FPJ0000
|
||||
|
||||
Boolean binit = false;
|
||||
|
||||
private void __Load(object sender, EventArgs e)
|
||||
{
|
||||
//this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
|
||||
//var sdate = DateTime.Parse(dtSD.Text);
|
||||
this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
|
||||
|
||||
//공정목록
|
||||
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm));
|
||||
//cmbProcess.Items.Clear();
|
||||
//cmbProcess.Items.Add("--전체--");
|
||||
//foreach (dsReport.ProcessListRow dr in dtProcList)
|
||||
//{
|
||||
// cmbProcess.Items.Add(dr.processs);
|
||||
//}
|
||||
//cmbProcess.Text = FCOMMON.info.Login.process;
|
||||
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
|
||||
|
||||
tbProcess.Text = FCOMMON.info.Login.process;
|
||||
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
|
||||
|
||||
//담당자목록 - 사용자목록으로 처리한다.
|
||||
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
|
||||
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
|
||||
// this.cmbUser.Items.Add(namestr);
|
||||
UpdateUserList(); //현재사용자의 이름을 반환한다
|
||||
|
||||
if (curLevel >= 5)
|
||||
{
|
||||
if (cmbUser.Items.Count > 0)
|
||||
cmbUser.SelectedIndex = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
cmbUser.Text = namestr;
|
||||
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
|
||||
}
|
||||
|
||||
|
||||
if (cmbUser.SelectedIndex < 0)
|
||||
{
|
||||
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
|
||||
this.cmbUser.Items.Add(namestr);
|
||||
cmbUser.Text = namestr;
|
||||
}
|
||||
|
||||
|
||||
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
|
||||
//foreach (var user in userList)
|
||||
//{
|
||||
// this.cmbUser.Items.Add(user);
|
||||
//}
|
||||
|
||||
|
||||
//state list
|
||||
//var stList = FCOMMON.DBM.getCodeList("05");
|
||||
//this.cmbState.Items.Clear();
|
||||
//cmbState.Items.Add("-- All --");
|
||||
//// cmbState.Items.Add("-- incomplete --");
|
||||
//foreach (var item in stList)
|
||||
// cmbState.Items.Add(item);
|
||||
//this.cmbState.SelectedIndex = 0;
|
||||
|
||||
|
||||
//일반사용자의경우에는 상태를 변경하지 못한다.
|
||||
|
||||
if (curLevel >= 5)
|
||||
{
|
||||
|
||||
}
|
||||
else btEdit.Enabled = false;
|
||||
|
||||
|
||||
//210930-
|
||||
if (FCOMMON.info.NotShowJobReportview)
|
||||
this.splitContainer1.Panel2Collapsed = true;
|
||||
|
||||
refreshData();
|
||||
binit = true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
void UpdateUserList()
|
||||
{
|
||||
//담당자목록 - 사용자목록으로 처리한다.
|
||||
@@ -74,79 +159,6 @@ namespace FPJ0000
|
||||
(int)FCOMMON.eGroupPermission.jobreport_kisul);
|
||||
}
|
||||
}
|
||||
private void __Load(object sender, EventArgs e)
|
||||
{
|
||||
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
|
||||
var sdate = DateTime.Parse(dtSD.Text);
|
||||
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
|
||||
|
||||
//공정목록
|
||||
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
|
||||
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
|
||||
//cmbProcess.Items.Clear();
|
||||
//cmbProcess.Items.Add("--전체--");
|
||||
//foreach (dsReport.ProcessListRow dr in dtProcList)
|
||||
//{
|
||||
// cmbProcess.Items.Add(dr.processs);
|
||||
//}
|
||||
//cmbProcess.Text = FCOMMON.info.Login.process;
|
||||
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
|
||||
|
||||
tbProcess.Text = FCOMMON.info.Login.process;
|
||||
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
|
||||
|
||||
//담당자목록 - 사용자목록으로 처리한다.
|
||||
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
|
||||
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
|
||||
// this.cmbUser.Items.Add(namestr);
|
||||
UpdateUserList(); //현재사용자의 이름을 반환한다
|
||||
|
||||
if (cmbUser.Items.Count > 0)
|
||||
cmbUser.SelectedIndex = 0;
|
||||
|
||||
if (cmbUser.SelectedIndex < 0)
|
||||
{
|
||||
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
|
||||
this.cmbUser.Items.Add(namestr);
|
||||
cmbUser.Text = namestr;
|
||||
}
|
||||
|
||||
|
||||
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
|
||||
//foreach (var user in userList)
|
||||
//{
|
||||
// this.cmbUser.Items.Add(user);
|
||||
//}
|
||||
|
||||
|
||||
//state list
|
||||
//var stList = FCOMMON.DBM.getCodeList("05");
|
||||
//this.cmbState.Items.Clear();
|
||||
//cmbState.Items.Add("-- All --");
|
||||
//// cmbState.Items.Add("-- incomplete --");
|
||||
//foreach (var item in stList)
|
||||
// cmbState.Items.Add(item);
|
||||
//this.cmbState.SelectedIndex = 0;
|
||||
|
||||
|
||||
//일반사용자의경우에는 상태를 변경하지 못한다.
|
||||
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
|
||||
if (curLevel >= 5)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
//210930-
|
||||
if (FCOMMON.info.NotShowJobReportview)
|
||||
this.splitContainer1.Panel2Collapsed = true;
|
||||
|
||||
refreshData();
|
||||
binit = true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void cmbProcess_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (binit == false) return;
|
||||
@@ -464,7 +476,7 @@ namespace FPJ0000
|
||||
|
||||
private void toolStripButton5_Click(object sender, EventArgs e)
|
||||
{
|
||||
var f = new JobReport_.rK5Dailyform();
|
||||
var f = new JobReport_.rJobReportOT();
|
||||
f.Show();
|
||||
}
|
||||
|
||||
|
||||
@@ -181,20 +181,20 @@
|
||||
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3Kv+EsF70UohSyqjIF6WpTQ3s
|
||||
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc1tzm04I9NMbc45L+BlqbucoztnfnvO2VIDoR98eF48
|
||||
5/vh/L7nCLgJu6dMvlihU0RX6n6HS3UUOWmeKu7U09EVWjrysWY0SKKuORzzZh8f2j0RD/vVSzZ6Zcxo
|
||||
Zq2ODVjtO6zYOGj8XLCh+KMF8ZXjTmGO3Mcb9UxUmWZp0mRhtWYX9DMM9BYGOjMDzfQmlL820DnmwAYD
|
||||
tI1TKH4/g7Sno9Q/knBpJ7Xu3MTQLIuvsww5GQzykk2ojBv4POYkAjeGFljo510olVsQcrf3NR+Oqwo2
|
||||
XZfGbInrryKt7hrquppR0lKFEKk/ggnC0jMIk51EdVs1v4qdZrC46kSYWMXwgtiKkHe9I+1on3yBOl0h
|
||||
L0mqjUThq0TkNsdD1HAJqQ2paBteRPuoHZ++r2ON9BQu66d5gbBG6BMkzWN1E314OSJDuTKHlyTXR5Hw
|
||||
ZWQ+y4Da6OBX6ZmkoCA9rDpcCC8Z8Ai4iShT0fmNKTAYNWjQ38Gj7gLEVZ1Hcm0MDGYnDKRYrmD1lKcT
|
||||
KxGEyXYJzt6Xuk4VHUJijRBDU1qU9mVBJs9H/JNQNCs/4NscAwMpVjvtwgBhyeZCyAOv4LjEVxwoOYjc
|
||||
pgTcqI9AQvUFXpIvT4SkJYO8SSi4+yELi0HuExNspMiAPI1HECjZPxcoOUAe8kVgoS+ulIci+3kK1GMK
|
||||
lCqKkPU2BaL6WBiIQE/+DR0R0C43ESh3VjiX108vrNEYnmN5VBPzuN2YiXQSFDfEo6Dp1vYdh3OTJYLW
|
||||
HQFnm7XuCP6Hg1shY5fgdP4Xp3Zkamuvh/fCPDvvPprUZvfGSZGZ3aaZdadNOzrtNi1TMC1RMHpZtrt4
|
||||
uObtNAujec5NUdSa382OH964QHAisys7QNTZfUyssAaIW+lt0j34/0XUSvuJOlaPpHb0+KfI0wQCgeAP
|
||||
5eegBTzkqG4AAAAASUVORK5CYII=
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s
|
||||
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn
|
||||
fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl
|
||||
Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy
|
||||
QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB
|
||||
xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb
|
||||
x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk
|
||||
fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd
|
||||
iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB
|
||||
Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox
|
||||
BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC
|
||||
pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn
|
||||
D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8
|
||||
AcSjn/E9z3PXAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="btEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@@ -223,6 +223,9 @@
|
||||
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>186, 17</value>
|
||||
</metadata>
|
||||
@@ -232,6 +235,19 @@
|
||||
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>393, 17</value>
|
||||
</metadata>
|
||||
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGJSURBVEhL7ZS9TsQwEITzeoBo4Dko6eiRDpAQ4i0oqWg5
|
||||
aICXoKKjpTQMmgkTs+tLQuhupJHXPzuffYqu22qszta7BeZ0eUXhgsLnD3u/9lf3O3+/kENghPocYKyt
|
||||
uKc52+fLIZF72FctaPQrTBJCIpjbYT7CjJkmNUcwt8Nmw3EwCm+5BUU9+hJReMsOw3jxuF9u347L9fPh
|
||||
YJ3xuaLwlv1FgN69n5SXclnWH6fl6umg32d8rii8ZX+poDBqrP3rizMo9ka9OAre5NZLZcBxlpih/ICM
|
||||
NYToY/E9OIWyV69VLmrifqTDHowGBeNjcXjrpehzqI/EDfUNJ1CHb16P+nDBM2gG00hMrKiphi/2Ulfd
|
||||
pNrhGRRj3a+R8bnqJq8d7j+v93itfpxjfC5vwugfGwy4oJhHoKif8bFwsA5So4w1QTX3nqwfNTFt4aA3
|
||||
Zq5BGmXGTRMaI5jbYfXImHmqA2sw1qJ9ts+XQhGGUbWstfqfj+3zFYUoHMbFuNwLF2C5vATmdKsN6rpP
|
||||
fZjWUaDH7j0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
@@ -256,4 +272,7 @@
|
||||
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
</root>
|
||||
116
SubProject/FPJ0000/dsPRJ.Designer.cs
generated
116
SubProject/FPJ0000/dsPRJ.Designer.cs
generated
@@ -25339,7 +25339,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
private void InitCommandCollection() {
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
|
||||
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[0].Connection = this.Connection;
|
||||
this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,
|
||||
@@ -25354,56 +25354,63 @@ ORDER BY pdate DESC";
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[1].Connection = this.Connection;
|
||||
this._commandCollection[1].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND " +
|
||||
"(ISNULL(import, 0) = 1) AND (gcode = @gcode)";
|
||||
this._commandCollection[1].CommandText = "SELECT COUNT(*) FROM JobReport\r\nwhere gcode = @gcode and idx = @idx\r\nand isnull(o" +
|
||||
"t2,0) > 0";
|
||||
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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 = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0)" +
|
||||
" = 1) AND (gcode = @gcode)";
|
||||
this._commandCollection[2].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND " +
|
||||
"(ISNULL(import, 0) = 1) AND (gcode = @gcode)";
|
||||
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[3].Connection = this.Connection;
|
||||
this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type)
|
||||
this._commandCollection[3].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0)" +
|
||||
" = 1) AND (gcode = @gcode)";
|
||||
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
|
||||
this._commandCollection[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.Original, false, null, "", "", ""));
|
||||
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[4].Connection = this.Connection;
|
||||
this._commandCollection[4].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type)
|
||||
AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt, ot2, otReason
|
||||
FROM JobReport
|
||||
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '')
|
||||
ORDER BY pdate DESC";
|
||||
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[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[4] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[4].Connection = this.Connection;
|
||||
this._commandCollection[4].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
|
||||
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].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[5] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[5].Connection = this.Connection;
|
||||
this._commandCollection[5].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
|
||||
AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput, ot2, otReason
|
||||
FROM JobReport
|
||||
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
|
||||
ORDER BY pdate DESC";
|
||||
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4].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[5] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[5].Connection = this.Connection;
|
||||
this._commandCollection[5].CommandText = @"SELECT pidx, projectName, MAX(pdate) AS pdate
|
||||
this._commandCollection[5].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[5].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[6] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[6].Connection = this.Connection;
|
||||
this._commandCollection[6].CommandText = @"SELECT pidx, projectName, MAX(pdate) AS pdate
|
||||
FROM JobReport
|
||||
WHERE (ISNULL(projectName, N'') LIKE @search OR
|
||||
ISNULL(description, N'') LIKE @search) AND (projectName <> '') AND (gcode = @gcode)
|
||||
GROUP BY pidx, projectName
|
||||
ORDER BY projectName";
|
||||
this._commandCollection[5].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[5].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[5].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[6].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -25483,7 +25490,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillByTagOnly(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string uid, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[3];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[4];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
@@ -25520,7 +25527,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual dsPRJ.JobReportDataTable GetByTagOnly(string sd, string ed, string uid, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[3];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[4];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
@@ -25555,7 +25562,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillPrjName(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string prjname, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[4];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[5];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
@@ -25592,7 +25599,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual dsPRJ.JobReportDataTable GetPrjName(string sd, string ed, string prjname, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[4];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[5];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
@@ -25627,7 +25634,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillSearch(dsPRJ.JobReportDataTable dataTable, string search, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[5];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[6];
|
||||
if ((search == null)) {
|
||||
throw new global::System.ArgumentNullException("search");
|
||||
}
|
||||
@@ -25652,7 +25659,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual dsPRJ.JobReportDataTable GetSearch(string search, string gcode) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[5];
|
||||
this.Adapter.SelectCommand = this.CommandCollection[6];
|
||||
if ((search == null)) {
|
||||
throw new global::System.ArgumentNullException("search");
|
||||
}
|
||||
@@ -26138,8 +26145,43 @@ ORDER BY projectName";
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
public virtual int DeleteImport(string sd, string ed, string user, string gcode) {
|
||||
public virtual global::System.Nullable<int> CheckOt2Input(string gcode, int idx) {
|
||||
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
command.Parameters[0].Value = ((string)(gcode));
|
||||
}
|
||||
command.Parameters[1].Value = ((int)(idx));
|
||||
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
|
||||
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
|
||||
!= global::System.Data.ConnectionState.Open)) {
|
||||
command.Connection.Open();
|
||||
}
|
||||
object returnValue;
|
||||
try {
|
||||
returnValue = command.ExecuteScalar();
|
||||
}
|
||||
finally {
|
||||
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
|
||||
command.Connection.Close();
|
||||
}
|
||||
}
|
||||
if (((returnValue == null)
|
||||
|| (returnValue.GetType() == typeof(global::System.DBNull)))) {
|
||||
return new global::System.Nullable<int>();
|
||||
}
|
||||
else {
|
||||
return new global::System.Nullable<int>(((int)(returnValue)));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
public virtual int DeleteImport(string sd, string ed, string user, string gcode) {
|
||||
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
|
||||
if ((sd == null)) {
|
||||
command.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
@@ -26186,7 +26228,7 @@ ORDER BY projectName";
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)]
|
||||
public virtual int DeleteImportAll(string sd, string ed, string gcode) {
|
||||
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
|
||||
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
|
||||
if ((sd == null)) {
|
||||
command.Parameters[0].Value = global::System.DBNull.Value;
|
||||
}
|
||||
|
||||
@@ -914,7 +914,20 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
|
||||
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckOt2Input" Modifier="Public" Name="CheckOt2Input" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckOt2Input">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT COUNT(*) FROM JobReport
|
||||
where gcode = @gcode and idx = @idx
|
||||
and isnull(ot2,0) > 0</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="DeleteImport">
|
||||
<DeleteCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>DELETE FROM [JobReport] WHERE pdate between @sd and @ed and wuid = @user</CommandText>
|
||||
@@ -938,7 +951,7 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImportAll" Modifier="Public" Name="DeleteImportAll" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="DeleteImportAll">
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImportAll" Modifier="Public" Name="DeleteImportAll" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="DeleteImportAll">
|
||||
<DeleteCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>DELETE FROM JobReport
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
Changes to this file may cause incorrect behavior and will be lost if
|
||||
the code is regenerated.
|
||||
</autogenerated>-->
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="265" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:Projects" ZOrder="4" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:ProjectsIOMap" ZOrder="9" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
|
||||
<Shape ID="DesignTable:ProjectsMailList" ZOrder="18" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
||||
<Shape ID="DesignTable:ProjectsPart" ZOrder="13" X="973" Y="68" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1257" Y="66" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1257" Y="66" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:ProjectsHistory" ZOrder="17" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
|
||||
<Shape ID="DesignTable:SPMaster" ZOrder="10" X="476" Y="366" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:EETGW_Note" ZOrder="15" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
||||
|
||||
454
SubProject/FPJ0000/dsReport.Designer.cs
generated
454
SubProject/FPJ0000/dsReport.Designer.cs
generated
@@ -540,6 +540,10 @@ namespace FPJ0000 {
|
||||
|
||||
private global::System.Data.DataColumn columnholyot;
|
||||
|
||||
private global::System.Data.DataColumn columnot2;
|
||||
|
||||
private global::System.Data.DataColumn columnholyot2;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public jobReportDataTable() {
|
||||
@@ -637,6 +641,22 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn ot2Column {
|
||||
get {
|
||||
return this.columnot2;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn holyot2Column {
|
||||
get {
|
||||
return this.columnholyot2;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -674,7 +694,7 @@ namespace FPJ0000 {
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot) {
|
||||
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2) {
|
||||
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
yymm,
|
||||
@@ -684,7 +704,9 @@ namespace FPJ0000 {
|
||||
hrs,
|
||||
ot,
|
||||
UserProcess,
|
||||
holyot};
|
||||
holyot,
|
||||
ot2,
|
||||
holyot2};
|
||||
rowjobReportRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowjobReportRow);
|
||||
return rowjobReportRow;
|
||||
@@ -723,6 +745,8 @@ namespace FPJ0000 {
|
||||
this.columnot = base.Columns["ot"];
|
||||
this.columnUserProcess = base.Columns["UserProcess"];
|
||||
this.columnholyot = base.Columns["holyot"];
|
||||
this.columnot2 = base.Columns["ot2"];
|
||||
this.columnholyot2 = base.Columns["holyot2"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -744,6 +768,10 @@ namespace FPJ0000 {
|
||||
base.Columns.Add(this.columnUserProcess);
|
||||
this.columnholyot = new global::System.Data.DataColumn("holyot", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnholyot);
|
||||
this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnot2);
|
||||
this.columnholyot2 = new global::System.Data.DataColumn("holyot2", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnholyot2);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnyymm,
|
||||
this.columnuid}, true));
|
||||
@@ -1491,6 +1519,10 @@ namespace FPJ0000 {
|
||||
|
||||
private global::System.Data.DataColumn columngcode;
|
||||
|
||||
private global::System.Data.DataColumn columnindate;
|
||||
|
||||
private global::System.Data.DataColumn columnoutdate;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public ProcessUserListDataTable() {
|
||||
@@ -1548,6 +1580,22 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn indateColumn {
|
||||
get {
|
||||
return this.columnindate;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn outdateColumn {
|
||||
get {
|
||||
return this.columnoutdate;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -1585,12 +1633,14 @@ namespace FPJ0000 {
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
|
||||
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode, string indate, string outdate) {
|
||||
ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
id,
|
||||
name,
|
||||
gcode};
|
||||
gcode,
|
||||
indate,
|
||||
outdate};
|
||||
rowProcessUserListRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowProcessUserListRow);
|
||||
return rowProcessUserListRow;
|
||||
@@ -1616,6 +1666,8 @@ namespace FPJ0000 {
|
||||
this.columnid = base.Columns["id"];
|
||||
this.columnname = base.Columns["name"];
|
||||
this.columngcode = base.Columns["gcode"];
|
||||
this.columnindate = base.Columns["indate"];
|
||||
this.columnoutdate = base.Columns["outdate"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -1627,6 +1679,10 @@ namespace FPJ0000 {
|
||||
base.Columns.Add(this.columnname);
|
||||
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columngcode);
|
||||
this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnindate);
|
||||
this.columnoutdate = new global::System.Data.DataColumn("outdate", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnoutdate);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnid}, false));
|
||||
this.columnid.Unique = true;
|
||||
@@ -1634,6 +1690,8 @@ namespace FPJ0000 {
|
||||
this.columnname.MaxLength = 100;
|
||||
this.columngcode.AllowDBNull = false;
|
||||
this.columngcode.MaxLength = 10;
|
||||
this.columnindate.MaxLength = 20;
|
||||
this.columnoutdate.MaxLength = 20;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -2138,6 +2196,14 @@ namespace FPJ0000 {
|
||||
|
||||
private global::System.Data.DataColumn columnww;
|
||||
|
||||
private global::System.Data.DataColumn columnotStart;
|
||||
|
||||
private global::System.Data.DataColumn columnotEnd;
|
||||
|
||||
private global::System.Data.DataColumn columnot2;
|
||||
|
||||
private global::System.Data.DataColumn columnotReason;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public vJobReportForUserDataTable() {
|
||||
@@ -2307,6 +2373,38 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn otStartColumn {
|
||||
get {
|
||||
return this.columnotStart;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn otEndColumn {
|
||||
get {
|
||||
return this.columnotEnd;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn ot2Column {
|
||||
get {
|
||||
return this.columnot2;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn otReasonColumn {
|
||||
get {
|
||||
return this.columnotReason;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -2361,7 +2459,11 @@ namespace FPJ0000 {
|
||||
string status,
|
||||
string projectName,
|
||||
string description,
|
||||
string ww) {
|
||||
string ww,
|
||||
System.DateTime otStart,
|
||||
System.DateTime otEnd,
|
||||
double ot2,
|
||||
string otReason) {
|
||||
vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
idx,
|
||||
@@ -2380,7 +2482,11 @@ namespace FPJ0000 {
|
||||
status,
|
||||
projectName,
|
||||
description,
|
||||
ww};
|
||||
ww,
|
||||
otStart,
|
||||
otEnd,
|
||||
ot2,
|
||||
otReason};
|
||||
rowvJobReportForUserRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowvJobReportForUserRow);
|
||||
return rowvJobReportForUserRow;
|
||||
@@ -2427,6 +2533,10 @@ namespace FPJ0000 {
|
||||
this.columnprojectName = base.Columns["projectName"];
|
||||
this.columndescription = base.Columns["description"];
|
||||
this.columnww = base.Columns["ww"];
|
||||
this.columnotStart = base.Columns["otStart"];
|
||||
this.columnotEnd = base.Columns["otEnd"];
|
||||
this.columnot2 = base.Columns["ot2"];
|
||||
this.columnotReason = base.Columns["otReason"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -2466,6 +2576,14 @@ namespace FPJ0000 {
|
||||
base.Columns.Add(this.columndescription);
|
||||
this.columnww = new global::System.Data.DataColumn("ww", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnww);
|
||||
this.columnotStart = new global::System.Data.DataColumn("otStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnotStart);
|
||||
this.columnotEnd = new global::System.Data.DataColumn("otEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnotEnd);
|
||||
this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnot2);
|
||||
this.columnotReason = new global::System.Data.DataColumn("otReason", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnotReason);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnidx}, true));
|
||||
this.columnidx.AllowDBNull = false;
|
||||
@@ -2487,6 +2605,7 @@ namespace FPJ0000 {
|
||||
this.columndescription.MaxLength = 2147483647;
|
||||
this.columnww.ReadOnly = true;
|
||||
this.columnww.MaxLength = 6;
|
||||
this.columnotReason.MaxLength = 255;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -3430,6 +3549,38 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public double ot2 {
|
||||
get {
|
||||
if (this.Isot2Null()) {
|
||||
return 0D;
|
||||
}
|
||||
else {
|
||||
return ((double)(this[this.tablejobReport.ot2Column]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablejobReport.ot2Column] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public double holyot2 {
|
||||
get {
|
||||
if (this.Isholyot2Null()) {
|
||||
return 0D;
|
||||
}
|
||||
else {
|
||||
return ((double)(this[this.tablejobReport.holyot2Column]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablejobReport.holyot2Column] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IstotalNull() {
|
||||
@@ -3501,6 +3652,30 @@ namespace FPJ0000 {
|
||||
public void SetholyotNull() {
|
||||
this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool Isot2Null() {
|
||||
return this.IsNull(this.tablejobReport.ot2Column);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void Setot2Null() {
|
||||
this[this.tablejobReport.ot2Column] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool Isholyot2Null() {
|
||||
return this.IsNull(this.tablejobReport.holyot2Column);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void Setholyot2Null() {
|
||||
this[this.tablejobReport.holyot2Column] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -3735,6 +3910,38 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public string indate {
|
||||
get {
|
||||
if (this.IsindateNull()) {
|
||||
return string.Empty;
|
||||
}
|
||||
else {
|
||||
return ((string)(this[this.tableProcessUserList.indateColumn]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tableProcessUserList.indateColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public string outdate {
|
||||
get {
|
||||
if (this.IsoutdateNull()) {
|
||||
return string.Empty;
|
||||
}
|
||||
else {
|
||||
return ((string)(this[this.tableProcessUserList.outdateColumn]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tableProcessUserList.outdateColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsidNull() {
|
||||
@@ -3758,6 +3965,30 @@ namespace FPJ0000 {
|
||||
public void SetnameNull() {
|
||||
this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsindateNull() {
|
||||
return this.IsNull(this.tableProcessUserList.indateColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetindateNull() {
|
||||
this[this.tableProcessUserList.indateColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsoutdateNull() {
|
||||
return this.IsNull(this.tableProcessUserList.outdateColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetoutdateNull() {
|
||||
this[this.tableProcessUserList.outdateColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -4168,6 +4399,70 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public System.DateTime otStart {
|
||||
get {
|
||||
try {
|
||||
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otStartColumn]));
|
||||
}
|
||||
catch (global::System.InvalidCastException e) {
|
||||
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otStart\' 열의 값이 DBNull입니다.", e);
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablevJobReportForUser.otStartColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public System.DateTime otEnd {
|
||||
get {
|
||||
try {
|
||||
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otEndColumn]));
|
||||
}
|
||||
catch (global::System.InvalidCastException e) {
|
||||
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otEnd\' 열의 값이 DBNull입니다.", e);
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablevJobReportForUser.otEndColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public double ot2 {
|
||||
get {
|
||||
if (this.Isot2Null()) {
|
||||
return 0D;
|
||||
}
|
||||
else {
|
||||
return ((double)(this[this.tablevJobReportForUser.ot2Column]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablevJobReportForUser.ot2Column] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public string otReason {
|
||||
get {
|
||||
if (this.IsotReasonNull()) {
|
||||
return string.Empty;
|
||||
}
|
||||
else {
|
||||
return ((string)(this[this.tablevJobReportForUser.otReasonColumn]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablevJobReportForUser.otReasonColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IspdateNull() {
|
||||
@@ -4347,6 +4642,54 @@ namespace FPJ0000 {
|
||||
public void SetwwNull() {
|
||||
this[this.tablevJobReportForUser.wwColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsotStartNull() {
|
||||
return this.IsNull(this.tablevJobReportForUser.otStartColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetotStartNull() {
|
||||
this[this.tablevJobReportForUser.otStartColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsotEndNull() {
|
||||
return this.IsNull(this.tablevJobReportForUser.otEndColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetotEndNull() {
|
||||
this[this.tablevJobReportForUser.otEndColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool Isot2Null() {
|
||||
return this.IsNull(this.tablevJobReportForUser.ot2Column);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void Setot2Null() {
|
||||
this[this.tablevJobReportForUser.ot2Column] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsotReasonNull() {
|
||||
return this.IsNull(this.tablevJobReportForUser.otReasonColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetotReasonNull() {
|
||||
this[this.tablevJobReportForUser.otReasonColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -5108,6 +5451,8 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
tableMapping.ColumnMappings.Add("ot", "ot");
|
||||
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
|
||||
tableMapping.ColumnMappings.Add("holyot", "holyot");
|
||||
tableMapping.ColumnMappings.Add("ot2", "ot2");
|
||||
tableMapping.ColumnMappings.Add("holyot2", "holyot2");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
}
|
||||
|
||||
@@ -5121,16 +5466,27 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
private void InitCommandCollection() {
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
|
||||
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[0].Connection = this.Connection;
|
||||
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot\r\nFROM vUserWork" +
|
||||
"TimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNUL" +
|
||||
"L(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
|
||||
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2\r\nFROM" +
|
||||
" vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gco" +
|
||||
"de) AND (ISNULL(UserProcess, \'\') LIKE @userprocess)\r\nORDER 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 yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
|
||||
ORDER BY yymm";
|
||||
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[1].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[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, "", "", ""));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -5192,6 +5548,66 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[1];
|
||||
if ((yyyy == null)) {
|
||||
throw new global::System.ArgumentNullException("yyyy");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
|
||||
}
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
|
||||
}
|
||||
if ((this.ClearBeforeFill == true)) {
|
||||
dataTable.Clear();
|
||||
}
|
||||
int returnValue = this.Adapter.Fill(dataTable);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
|
||||
public virtual dsReport.jobReportDataTable GetByOt2(string yyyy, string gcode, string userprocess) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[1];
|
||||
if ((yyyy == null)) {
|
||||
throw new global::System.ArgumentNullException("yyyy");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
|
||||
}
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
|
||||
}
|
||||
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -5716,6 +6132,8 @@ ORDER BY processs, JobReport.pdate, uname";
|
||||
tableMapping.ColumnMappings.Add("id", "id");
|
||||
tableMapping.ColumnMappings.Add("name", "name");
|
||||
tableMapping.ColumnMappings.Add("gcode", "gcode");
|
||||
tableMapping.ColumnMappings.Add("indate", "indate");
|
||||
tableMapping.ColumnMappings.Add("outdate", "outdate");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._adapter.DeleteCommand.Connection = this.Connection;
|
||||
@@ -5759,12 +6177,12 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
|
||||
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[0].Connection = this.Connection;
|
||||
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, JobReport.gcode
|
||||
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
FROM EETGW_GroupUser INNER JOIN
|
||||
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
|
||||
Users ON JobReport.uid = Users.id
|
||||
WHERE (Users.id <> 'dev') AND (Users.id <> 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
ORDER BY Users.name";
|
||||
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
@@ -6539,6 +6957,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
tableMapping.ColumnMappings.Add("projectName", "projectName");
|
||||
tableMapping.ColumnMappings.Add("description", "description");
|
||||
tableMapping.ColumnMappings.Add("ww", "ww");
|
||||
tableMapping.ColumnMappings.Add("otStart", "otStart");
|
||||
tableMapping.ColumnMappings.Add("otEnd", "otEnd");
|
||||
tableMapping.ColumnMappings.Add("ot2", "ot2");
|
||||
tableMapping.ColumnMappings.Add("otReason", "otReason");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
}
|
||||
|
||||
@@ -6555,10 +6977,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
|
||||
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[0].Connection = this.Connection;
|
||||
this._commandCollection[0].CommandText = "SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart," +
|
||||
" package, userProcess, status, projectName, description, ww\r\nFROM vJobReport" +
|
||||
"ForUser\r\nWHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)\r\nORDER BY pdate" +
|
||||
"";
|
||||
this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
FROM vJobReportForUser
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
|
||||
ORDER BY pdate";
|
||||
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 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("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
ORDER BY yymm</CommandText>
|
||||
@@ -34,8 +34,27 @@ ORDER BY yymm</CommandText>
|
||||
<Mapping SourceColumn="ot" DataSetColumn="ot" />
|
||||
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
|
||||
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="holyot2" DataSetColumn="holyot2" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOt2" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOt2" GeneratorSourceName="FillByOt2" GetMethodModifier="Public" GetMethodName="GetByOt2" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOt2" UserSourceName="FillByOt2">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
|
||||
ORDER BY yymm</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</Sources>
|
||||
</TableAdapter>
|
||||
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportDayTableAdapter" GeneratorDataComponentClassName="JobReportDayTableAdapter" Name="JobReportDay" UserDataComponentName="JobReportDayTableAdapter">
|
||||
<MainSource>
|
||||
@@ -108,12 +127,12 @@ ORDER BY processs</CommandText>
|
||||
</DeleteCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT Users.id, Users.name, JobReport.gcode
|
||||
<CommandText>SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
FROM EETGW_GroupUser INNER JOIN
|
||||
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
|
||||
Users ON JobReport.uid = Users.id
|
||||
WHERE (Users.id <> 'dev') AND (Users.id <> 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
ORDER BY Users.name</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="Process" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="Process" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -145,6 +164,8 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
|
||||
<Mapping SourceColumn="id" DataSetColumn="id" />
|
||||
<Mapping SourceColumn="name" DataSetColumn="name" />
|
||||
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
|
||||
<Mapping SourceColumn="indate" DataSetColumn="indate" />
|
||||
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
@@ -230,8 +251,8 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
<MainSource>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
FROM vJobReportForUser
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -262,6 +283,10 @@ ORDER BY pdate</CommandText>
|
||||
<Mapping SourceColumn="projectName" DataSetColumn="projectName" />
|
||||
<Mapping SourceColumn="description" DataSetColumn="description" />
|
||||
<Mapping SourceColumn="ww" DataSetColumn="ww" />
|
||||
<Mapping SourceColumn="otStart" DataSetColumn="otStart" />
|
||||
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
@@ -308,6 +333,8 @@ ORDER BY pdate</CommandText>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="holyot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot2" msprop:Generator_ColumnVarNameInTable="columnholyot2" msprop:Generator_ColumnPropNameInTable="holyot2Column" msprop:Generator_UserColumnName="holyot2" type="xs:double" minOccurs="0" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -384,6 +411,20 @@ ORDER BY pdate</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -533,6 +574,16 @@ ORDER BY pdate</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
|
||||
<xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
|
||||
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="otReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:Generator_UserColumnName="otReason" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="255" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
Changes to this file may cause incorrect behavior and will be lost if
|
||||
the code is regenerated.
|
||||
</autogenerated>-->
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="104" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:jobReport" ZOrder="3" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
|
||||
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
|
||||
<Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
|
||||
<Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
|
||||
<Shape ID="DesignTable:ProcessList" ZOrder="8" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:ProcessUserList" ZOrder="7" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
|
||||
<Shape ID="DesignTable:HolidayLIst" ZOrder="5" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:PartSummary" ZOrder="6" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
|
||||
<Shape ID="DesignTable:K5DailyForm" ZOrder="4" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
|
||||
</Shapes>
|
||||
|
||||
Reference in New Issue
Block a user