파트리스트 공유폴더 열기 기능 수정 /
This commit is contained in:
		| @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; | ||||
| // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 | ||||
| // 지정되도록 할 수 있습니다. | ||||
| // [assembly: AssemblyVersion("1.0.*")] | ||||
| [assembly: AssemblyVersion("21.07.16.1400")] | ||||
| [assembly: AssemblyFileVersion("21.07.16.1400")] | ||||
| [assembly: AssemblyVersion("21.07.20.2100")] | ||||
| [assembly: AssemblyFileVersion("21.07.20.2100")] | ||||
|   | ||||
| @@ -126,9 +126,11 @@ namespace FPJ0000 | ||||
|             if (curLevel >= 5) | ||||
|             { | ||||
|                 btSave.Visible = true; | ||||
|                 btImport.Visible = true; | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 btImport.Visible = false; | ||||
|                 btSave.Visible = false; | ||||
|                 //btViewDel.Visible = false; | ||||
|                 fpSpread1.EditMode = false; | ||||
| @@ -674,7 +676,8 @@ namespace FPJ0000 | ||||
|  | ||||
|         private void btImport_Click(object sender, EventArgs e) | ||||
|         { | ||||
|  | ||||
|             var f = new FPJ0000.JobReport_.fJobReportImport(); | ||||
|             f.ShowDialog(); | ||||
|         } | ||||
|  | ||||
|         private void toolStripButton5_Click(object sender, EventArgs e) | ||||
|   | ||||
| @@ -61,6 +61,8 @@ | ||||
|             this.dsPRJ = new FPJ0000.dsPRJ(); | ||||
|             this.button3 = new System.Windows.Forms.Button(); | ||||
|             this.panel1 = new System.Windows.Forms.Panel(); | ||||
|             this.nudMon = new System.Windows.Forms.NumericUpDown(); | ||||
|             this.label4 = new System.Windows.Forms.Label(); | ||||
|             this.nudname = new System.Windows.Forms.NumericUpDown(); | ||||
|             this.label21 = new System.Windows.Forms.Label(); | ||||
|             this.nuduid = new System.Windows.Forms.NumericUpDown(); | ||||
| @@ -107,19 +109,18 @@ | ||||
|             this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar(); | ||||
|             this.panel2 = new System.Windows.Forms.Panel(); | ||||
|             this.button2 = new System.Windows.Forms.Button(); | ||||
|             this.comboBox1 = new System.Windows.Forms.ComboBox(); | ||||
|             this.cmbUser = new System.Windows.Forms.ComboBox(); | ||||
|             this.label8 = new System.Windows.Forms.Label(); | ||||
|             this.checkBox2 = new System.Windows.Forms.CheckBox(); | ||||
|             this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); | ||||
|             this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); | ||||
|             this.label14 = new System.Windows.Forms.Label(); | ||||
|             this.jobReportTableAdapter = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); | ||||
|             this.nudMon = new System.Windows.Forms.NumericUpDown(); | ||||
|             this.label4 = new System.Windows.Forms.Label(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); | ||||
|             this.panel1.SuspendLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudMon)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudname)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nuduid)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudot)).BeginInit(); | ||||
| @@ -138,7 +139,6 @@ | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); | ||||
|             this.bn.SuspendLayout(); | ||||
|             this.panel2.SuspendLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudMon)).BeginInit(); | ||||
|             this.SuspendLayout(); | ||||
|             //  | ||||
|             // textBox1 | ||||
| @@ -161,7 +161,7 @@ | ||||
|             //  | ||||
|             // button1 | ||||
|             //  | ||||
|             this.button1.Location = new System.Drawing.Point(525, 8); | ||||
|             this.button1.Location = new System.Drawing.Point(667, 7); | ||||
|             this.button1.Name = "button1"; | ||||
|             this.button1.Size = new System.Drawing.Size(102, 21); | ||||
|             this.button1.TabIndex = 4; | ||||
| @@ -200,10 +200,10 @@ | ||||
|             this.tagDataGridViewTextBoxColumn}); | ||||
|             this.dataGridView1.DataSource = this.bs; | ||||
|             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; | ||||
|             this.dataGridView1.Location = new System.Drawing.Point(0, 158); | ||||
|             this.dataGridView1.Location = new System.Drawing.Point(0, 95); | ||||
|             this.dataGridView1.Name = "dataGridView1"; | ||||
|             this.dataGridView1.RowTemplate.Height = 23; | ||||
|             this.dataGridView1.Size = new System.Drawing.Size(1138, 370); | ||||
|             this.dataGridView1.Size = new System.Drawing.Size(1138, 433); | ||||
|             this.dataGridView1.TabIndex = 1; | ||||
|             //  | ||||
|             // idxDataGridViewTextBoxColumn | ||||
| @@ -359,7 +359,7 @@ | ||||
|             //  | ||||
|             // button3 | ||||
|             //  | ||||
|             this.button3.Location = new System.Drawing.Point(525, 35); | ||||
|             this.button3.Location = new System.Drawing.Point(775, 6); | ||||
|             this.button3.Name = "button3"; | ||||
|             this.button3.Size = new System.Drawing.Size(102, 21); | ||||
|             this.button3.TabIndex = 6; | ||||
| @@ -409,13 +409,35 @@ | ||||
|             this.panel1.Dock = System.Windows.Forms.DockStyle.Top; | ||||
|             this.panel1.Location = new System.Drawing.Point(0, 0); | ||||
|             this.panel1.Name = "panel1"; | ||||
|             this.panel1.Size = new System.Drawing.Size(1138, 158); | ||||
|             this.panel1.Size = new System.Drawing.Size(1138, 95); | ||||
|             this.panel1.TabIndex = 0; | ||||
|             this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); | ||||
|             //  | ||||
|             // nudMon | ||||
|             //  | ||||
|             this.nudMon.Location = new System.Drawing.Point(27, 63); | ||||
|             this.nudMon.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
|             this.nudMon.Name = "nudMon"; | ||||
|             this.nudMon.Size = new System.Drawing.Size(45, 21); | ||||
|             this.nudMon.TabIndex = 28; | ||||
|             this.nudMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             //  | ||||
|             // label4 | ||||
|             //  | ||||
|             this.label4.AutoSize = true; | ||||
|             this.label4.Location = new System.Drawing.Point(33, 45); | ||||
|             this.label4.Name = "label4"; | ||||
|             this.label4.Size = new System.Drawing.Size(30, 12); | ||||
|             this.label4.TabIndex = 27; | ||||
|             this.label4.Text = "Mon"; | ||||
|             //  | ||||
|             // nudname | ||||
|             //  | ||||
|             this.nudname.Location = new System.Drawing.Point(581, 120); | ||||
|             this.nudname.Location = new System.Drawing.Point(639, 63); | ||||
|             this.nudname.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -434,7 +456,7 @@ | ||||
|             // label21 | ||||
|             //  | ||||
|             this.label21.AutoSize = true; | ||||
|             this.label21.Location = new System.Drawing.Point(587, 102); | ||||
|             this.label21.Location = new System.Drawing.Point(645, 45); | ||||
|             this.label21.Name = "label21"; | ||||
|             this.label21.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label21.TabIndex = 25; | ||||
| @@ -442,7 +464,7 @@ | ||||
|             //  | ||||
|             // nuduid | ||||
|             //  | ||||
|             this.nuduid.Location = new System.Drawing.Point(530, 120); | ||||
|             this.nuduid.Location = new System.Drawing.Point(588, 63); | ||||
|             this.nuduid.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -456,7 +478,7 @@ | ||||
|             // label20 | ||||
|             //  | ||||
|             this.label20.AutoSize = true; | ||||
|             this.label20.Location = new System.Drawing.Point(536, 102); | ||||
|             this.label20.Location = new System.Drawing.Point(594, 45); | ||||
|             this.label20.Name = "label20"; | ||||
|             this.label20.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label20.TabIndex = 25; | ||||
| @@ -464,7 +486,7 @@ | ||||
|             //  | ||||
|             // nudot | ||||
|             //  | ||||
|             this.nudot.Location = new System.Drawing.Point(479, 120); | ||||
|             this.nudot.Location = new System.Drawing.Point(537, 63); | ||||
|             this.nudot.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -475,7 +497,7 @@ | ||||
|             this.nudot.TabIndex = 26; | ||||
|             this.nudot.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudot.Value = new decimal(new int[] { | ||||
|             15, | ||||
|             12, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -483,7 +505,7 @@ | ||||
|             // label19 | ||||
|             //  | ||||
|             this.label19.AutoSize = true; | ||||
|             this.label19.Location = new System.Drawing.Point(485, 102); | ||||
|             this.label19.Location = new System.Drawing.Point(543, 45); | ||||
|             this.label19.Name = "label19"; | ||||
|             this.label19.Size = new System.Drawing.Size(22, 12); | ||||
|             this.label19.TabIndex = 25; | ||||
| @@ -491,7 +513,7 @@ | ||||
|             //  | ||||
|             // nudhrd | ||||
|             //  | ||||
|             this.nudhrd.Location = new System.Drawing.Point(428, 120); | ||||
|             this.nudhrd.Location = new System.Drawing.Point(486, 63); | ||||
|             this.nudhrd.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -502,7 +524,7 @@ | ||||
|             this.nudhrd.TabIndex = 26; | ||||
|             this.nudhrd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudhrd.Value = new decimal(new int[] { | ||||
|             14, | ||||
|             11, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -510,7 +532,7 @@ | ||||
|             // label18 | ||||
|             //  | ||||
|             this.label18.AutoSize = true; | ||||
|             this.label18.Location = new System.Drawing.Point(434, 102); | ||||
|             this.label18.Location = new System.Drawing.Point(492, 45); | ||||
|             this.label18.Name = "label18"; | ||||
|             this.label18.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label18.TabIndex = 25; | ||||
| @@ -518,7 +540,7 @@ | ||||
|             //  | ||||
|             // nudbio | ||||
|             //  | ||||
|             this.nudbio.Location = new System.Drawing.Point(377, 120); | ||||
|             this.nudbio.Location = new System.Drawing.Point(435, 63); | ||||
|             this.nudbio.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -529,14 +551,14 @@ | ||||
|             this.nudbio.TabIndex = 24; | ||||
|             this.nudbio.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudbio.Value = new decimal(new int[] { | ||||
|             13, | ||||
|             10, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
|             //  | ||||
|             // nudst | ||||
|             //  | ||||
|             this.nudst.Location = new System.Drawing.Point(173, 120); | ||||
|             this.nudst.Location = new System.Drawing.Point(231, 63); | ||||
|             this.nudst.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -547,7 +569,7 @@ | ||||
|             this.nudst.TabIndex = 24; | ||||
|             this.nudst.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudst.Value = new decimal(new int[] { | ||||
|             8, | ||||
|             6, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -555,7 +577,7 @@ | ||||
|             // label17 | ||||
|             //  | ||||
|             this.label17.AutoSize = true; | ||||
|             this.label17.Location = new System.Drawing.Point(383, 102); | ||||
|             this.label17.Location = new System.Drawing.Point(441, 45); | ||||
|             this.label17.Name = "label17"; | ||||
|             this.label17.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label17.TabIndex = 23; | ||||
| @@ -564,7 +586,7 @@ | ||||
|             // label12 | ||||
|             //  | ||||
|             this.label12.AutoSize = true; | ||||
|             this.label12.Location = new System.Drawing.Point(179, 102); | ||||
|             this.label12.Location = new System.Drawing.Point(237, 45); | ||||
|             this.label12.Name = "label12"; | ||||
|             this.label12.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label12.TabIndex = 23; | ||||
| @@ -572,7 +594,7 @@ | ||||
|             //  | ||||
|             // nuditem | ||||
|             //  | ||||
|             this.nuditem.Location = new System.Drawing.Point(326, 120); | ||||
|             this.nuditem.Location = new System.Drawing.Point(384, 63); | ||||
|             this.nuditem.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -583,14 +605,14 @@ | ||||
|             this.nuditem.TabIndex = 24; | ||||
|             this.nuditem.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nuditem.Value = new decimal(new int[] { | ||||
|             12, | ||||
|             9, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
|             //  | ||||
|             // nudpack | ||||
|             //  | ||||
|             this.nudpack.Location = new System.Drawing.Point(122, 120); | ||||
|             this.nudpack.Location = new System.Drawing.Point(180, 63); | ||||
|             this.nudpack.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -601,7 +623,7 @@ | ||||
|             this.nudpack.TabIndex = 24; | ||||
|             this.nudpack.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudpack.Value = new decimal(new int[] { | ||||
|             7, | ||||
|             5, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -609,7 +631,7 @@ | ||||
|             // label16 | ||||
|             //  | ||||
|             this.label16.AutoSize = true; | ||||
|             this.label16.Location = new System.Drawing.Point(332, 102); | ||||
|             this.label16.Location = new System.Drawing.Point(390, 45); | ||||
|             this.label16.Name = "label16"; | ||||
|             this.label16.Size = new System.Drawing.Size(41, 12); | ||||
|             this.label16.TabIndex = 23; | ||||
| @@ -618,7 +640,7 @@ | ||||
|             // label11 | ||||
|             //  | ||||
|             this.label11.AutoSize = true; | ||||
|             this.label11.Location = new System.Drawing.Point(128, 102); | ||||
|             this.label11.Location = new System.Drawing.Point(186, 45); | ||||
|             this.label11.Name = "label11"; | ||||
|             this.label11.Size = new System.Drawing.Size(41, 12); | ||||
|             this.label11.TabIndex = 23; | ||||
| @@ -626,7 +648,7 @@ | ||||
|             //  | ||||
|             // nudbunru | ||||
|             //  | ||||
|             this.nudbunru.Location = new System.Drawing.Point(275, 120); | ||||
|             this.nudbunru.Location = new System.Drawing.Point(333, 63); | ||||
|             this.nudbunru.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -637,14 +659,14 @@ | ||||
|             this.nudbunru.TabIndex = 24; | ||||
|             this.nudbunru.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudbunru.Value = new decimal(new int[] { | ||||
|             10, | ||||
|             8, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
|             //  | ||||
|             // nudreq | ||||
|             //  | ||||
|             this.nudreq.Location = new System.Drawing.Point(71, 120); | ||||
|             this.nudreq.Location = new System.Drawing.Point(129, 63); | ||||
|             this.nudreq.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -655,7 +677,7 @@ | ||||
|             this.nudreq.TabIndex = 24; | ||||
|             this.nudreq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudreq.Value = new decimal(new int[] { | ||||
|             6, | ||||
|             4, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -663,7 +685,7 @@ | ||||
|             // label15 | ||||
|             //  | ||||
|             this.label15.AutoSize = true; | ||||
|             this.label15.Location = new System.Drawing.Point(281, 102); | ||||
|             this.label15.Location = new System.Drawing.Point(339, 45); | ||||
|             this.label15.Name = "label15"; | ||||
|             this.label15.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label15.TabIndex = 23; | ||||
| @@ -672,7 +694,7 @@ | ||||
|             // label10 | ||||
|             //  | ||||
|             this.label10.AutoSize = true; | ||||
|             this.label10.Location = new System.Drawing.Point(77, 102); | ||||
|             this.label10.Location = new System.Drawing.Point(135, 45); | ||||
|             this.label10.Name = "label10"; | ||||
|             this.label10.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label10.TabIndex = 23; | ||||
| @@ -680,7 +702,7 @@ | ||||
|             //  | ||||
|             // nudtype | ||||
|             //  | ||||
|             this.nudtype.Location = new System.Drawing.Point(224, 120); | ||||
|             this.nudtype.Location = new System.Drawing.Point(282, 63); | ||||
|             this.nudtype.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -691,7 +713,7 @@ | ||||
|             this.nudtype.TabIndex = 24; | ||||
|             this.nudtype.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nudtype.Value = new decimal(new int[] { | ||||
|             9, | ||||
|             7, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -699,7 +721,7 @@ | ||||
|             // label13 | ||||
|             //  | ||||
|             this.label13.AutoSize = true; | ||||
|             this.label13.Location = new System.Drawing.Point(230, 102); | ||||
|             this.label13.Location = new System.Drawing.Point(288, 45); | ||||
|             this.label13.Name = "label13"; | ||||
|             this.label13.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label13.TabIndex = 23; | ||||
| @@ -707,7 +729,7 @@ | ||||
|             //  | ||||
|             // nuddate | ||||
|             //  | ||||
|             this.nuddate.Location = new System.Drawing.Point(20, 120); | ||||
|             this.nuddate.Location = new System.Drawing.Point(78, 63); | ||||
|             this.nuddate.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -718,7 +740,7 @@ | ||||
|             this.nuddate.TabIndex = 24; | ||||
|             this.nuddate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             this.nuddate.Value = new decimal(new int[] { | ||||
|             5, | ||||
|             3, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
| @@ -726,7 +748,7 @@ | ||||
|             // label9 | ||||
|             //  | ||||
|             this.label9.AutoSize = true; | ||||
|             this.label9.Location = new System.Drawing.Point(26, 102); | ||||
|             this.label9.Location = new System.Drawing.Point(84, 45); | ||||
|             this.label9.Name = "label9"; | ||||
|             this.label9.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label9.TabIndex = 23; | ||||
| @@ -735,7 +757,7 @@ | ||||
|             // checkBox1 | ||||
|             //  | ||||
|             this.checkBox1.AutoSize = true; | ||||
|             this.checkBox1.Location = new System.Drawing.Point(474, 66); | ||||
|             this.checkBox1.Location = new System.Drawing.Point(883, 9); | ||||
|             this.checkBox1.Name = "checkBox1"; | ||||
|             this.checkBox1.Size = new System.Drawing.Size(127, 16); | ||||
|             this.checkBox1.TabIndex = 19; | ||||
| @@ -745,7 +767,7 @@ | ||||
|             // label3 | ||||
|             //  | ||||
|             this.label3.AutoSize = true; | ||||
|             this.label3.Location = new System.Drawing.Point(455, 40); | ||||
|             this.label3.Location = new System.Drawing.Point(443, 13); | ||||
|             this.label3.Name = "label3"; | ||||
|             this.label3.Size = new System.Drawing.Size(14, 12); | ||||
|             this.label3.TabIndex = 10; | ||||
| @@ -753,7 +775,7 @@ | ||||
|             //  | ||||
|             // nudE | ||||
|             //  | ||||
|             this.nudE.Location = new System.Drawing.Point(474, 36); | ||||
|             this.nudE.Location = new System.Drawing.Point(462, 9); | ||||
|             this.nudE.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -771,7 +793,7 @@ | ||||
|             //  | ||||
|             // nudS | ||||
|             //  | ||||
|             this.nudS.Location = new System.Drawing.Point(406, 36); | ||||
|             this.nudS.Location = new System.Drawing.Point(394, 9); | ||||
|             this.nudS.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
| @@ -790,7 +812,7 @@ | ||||
|             // label2 | ||||
|             //  | ||||
|             this.label2.AutoSize = true; | ||||
|             this.label2.Location = new System.Drawing.Point(329, 40); | ||||
|             this.label2.Location = new System.Drawing.Point(317, 13); | ||||
|             this.label2.Name = "label2"; | ||||
|             this.label2.Size = new System.Drawing.Size(70, 12); | ||||
|             this.label2.TabIndex = 7; | ||||
| @@ -945,7 +967,7 @@ | ||||
|             //  | ||||
|             this.panel2.BackColor = System.Drawing.Color.HotPink; | ||||
|             this.panel2.Controls.Add(this.button2); | ||||
|             this.panel2.Controls.Add(this.comboBox1); | ||||
|             this.panel2.Controls.Add(this.cmbUser); | ||||
|             this.panel2.Controls.Add(this.label8); | ||||
|             this.panel2.Controls.Add(this.checkBox2); | ||||
|             this.panel2.Controls.Add(this.dateTimePicker1); | ||||
| @@ -959,26 +981,27 @@ | ||||
|             //  | ||||
|             // button2 | ||||
|             //  | ||||
|             this.button2.Location = new System.Drawing.Point(741, 35); | ||||
|             this.button2.Location = new System.Drawing.Point(809, 39); | ||||
|             this.button2.Name = "button2"; | ||||
|             this.button2.Size = new System.Drawing.Size(102, 21); | ||||
|             this.button2.TabIndex = 23; | ||||
|             this.button2.Text = "RUN"; | ||||
|             this.button2.UseVisualStyleBackColor = true; | ||||
|             this.button2.Click += new System.EventHandler(this.button2_Click); | ||||
|             //  | ||||
|             // comboBox1 | ||||
|             //  | ||||
|             this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; | ||||
|             this.comboBox1.FormattingEnabled = true; | ||||
|             this.comboBox1.Location = new System.Drawing.Point(457, 40); | ||||
|             this.comboBox1.Name = "comboBox1"; | ||||
|             this.comboBox1.Size = new System.Drawing.Size(171, 20); | ||||
|             this.comboBox1.TabIndex = 22; | ||||
|             this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; | ||||
|             this.cmbUser.FormattingEnabled = true; | ||||
|             this.cmbUser.Location = new System.Drawing.Point(457, 40); | ||||
|             this.cmbUser.Name = "comboBox1"; | ||||
|             this.cmbUser.Size = new System.Drawing.Size(171, 20); | ||||
|             this.cmbUser.TabIndex = 22; | ||||
|             //  | ||||
|             // label8 | ||||
|             //  | ||||
|             this.label8.AutoSize = true; | ||||
|             this.label8.Location = new System.Drawing.Point(422, 45); | ||||
|             this.label8.Location = new System.Drawing.Point(422, 44); | ||||
|             this.label8.Name = "label8"; | ||||
|             this.label8.Size = new System.Drawing.Size(29, 12); | ||||
|             this.label8.TabIndex = 21; | ||||
| @@ -987,11 +1010,14 @@ | ||||
|             // checkBox2 | ||||
|             //  | ||||
|             this.checkBox2.AutoSize = true; | ||||
|             this.checkBox2.Location = new System.Drawing.Point(639, 40); | ||||
|             this.checkBox2.Checked = true; | ||||
|             this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked; | ||||
|             this.checkBox2.Enabled = false; | ||||
|             this.checkBox2.Location = new System.Drawing.Point(639, 42); | ||||
|             this.checkBox2.Name = "checkBox2"; | ||||
|             this.checkBox2.Size = new System.Drawing.Size(89, 16); | ||||
|             this.checkBox2.Size = new System.Drawing.Size(164, 16); | ||||
|             this.checkBox2.TabIndex = 19; | ||||
|             this.checkBox2.Text = "Import Only"; | ||||
|             this.checkBox2.Text = "업로드 데이터만 대상으로"; | ||||
|             this.checkBox2.UseVisualStyleBackColor = true; | ||||
|             //  | ||||
|             // dateTimePicker1 | ||||
| @@ -1025,28 +1051,6 @@ | ||||
|             //  | ||||
|             this.jobReportTableAdapter.ClearBeforeFill = true; | ||||
|             //  | ||||
|             // nudMon | ||||
|             //  | ||||
|             this.nudMon.Location = new System.Drawing.Point(20, 66); | ||||
|             this.nudMon.Maximum = new decimal(new int[] { | ||||
|             65535, | ||||
|             0, | ||||
|             0, | ||||
|             0}); | ||||
|             this.nudMon.Name = "nudMon"; | ||||
|             this.nudMon.Size = new System.Drawing.Size(45, 21); | ||||
|             this.nudMon.TabIndex = 28; | ||||
|             this.nudMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|             //  | ||||
|             // label4 | ||||
|             //  | ||||
|             this.label4.AutoSize = true; | ||||
|             this.label4.Location = new System.Drawing.Point(26, 48); | ||||
|             this.label4.Name = "label4"; | ||||
|             this.label4.Size = new System.Drawing.Size(30, 12); | ||||
|             this.label4.TabIndex = 27; | ||||
|             this.label4.Text = "Mon"; | ||||
|             //  | ||||
|             // fJobReportImport | ||||
|             //  | ||||
|             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); | ||||
| @@ -1064,6 +1068,7 @@ | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); | ||||
|             this.panel1.ResumeLayout(false); | ||||
|             this.panel1.PerformLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudMon)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudname)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nuduid)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudot)).EndInit(); | ||||
| @@ -1084,7 +1089,6 @@ | ||||
|             this.bn.PerformLayout(); | ||||
|             this.panel2.ResumeLayout(false); | ||||
|             this.panel2.PerformLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.nudMon)).EndInit(); | ||||
|             this.ResumeLayout(false); | ||||
|             this.PerformLayout(); | ||||
|  | ||||
| @@ -1120,7 +1124,7 @@ | ||||
|         private System.Windows.Forms.NumericUpDown nudS; | ||||
|         private System.Windows.Forms.CheckBox checkBox1; | ||||
|         private System.Windows.Forms.Panel panel2; | ||||
|         private System.Windows.Forms.ComboBox comboBox1; | ||||
|         private System.Windows.Forms.ComboBox cmbUser; | ||||
|         private System.Windows.Forms.Label label8; | ||||
|         private System.Windows.Forms.CheckBox checkBox2; | ||||
|         private System.Windows.Forms.DateTimePicker dateTimePicker1; | ||||
|   | ||||
| @@ -26,10 +26,20 @@ namespace FPJ0000.JobReport_ | ||||
|  | ||||
|             //담당자목록 | ||||
|  | ||||
|             var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); | ||||
|             //this.cmbUser.DisplayMember = "dispName"; | ||||
|             //this.cmbUser.ValueMember = "id"; | ||||
|             //this.cmbUser.DataSource = dt_users; | ||||
|             var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < | ||||
|                                                       //10", false, false); | ||||
|  | ||||
|             var newdr = dt_users.NewRow(); | ||||
|             newdr["id"] = "--"; | ||||
|             newdr["name"] = "전체"; | ||||
|             newdr["dispName"] = "--전체--"; | ||||
|             dt_users.Rows.Add(newdr); | ||||
|             dt_users.AcceptChanges(); | ||||
|  | ||||
|             this.cmbUser.DisplayMember = "dispName"; | ||||
|             this.cmbUser.ValueMember = "id"; | ||||
|             this.cmbUser.DataSource = dt_users; | ||||
|             this.cmbUser.SelectedValue = "--"; | ||||
|         } | ||||
|  | ||||
|         void __Closed(object sender, FormClosedEventArgs e) | ||||
| @@ -107,7 +117,7 @@ namespace FPJ0000.JobReport_ | ||||
|             this.dsPRJ.JobReport.Clear(); | ||||
|             this.dsPRJ.JobReport.AcceptChanges(); | ||||
|             var dt_users = FCOMMON.DBM.getUserTable(); | ||||
|  | ||||
|             var unknownlist = new List<string>(); | ||||
|             try | ||||
|             { | ||||
|                 for (int r = MinRow; r <= MaxRow; r++) | ||||
| @@ -128,7 +138,7 @@ namespace FPJ0000.JobReport_ | ||||
|  | ||||
|                         var monstr = sheet.readStr(r, colidxm); | ||||
|                         var dayval = sheet.readNum(r, colidx); | ||||
|                         var daystr = string.Format("{0}-{1}-{2}",DateTime.Now.Year,monstr,dayval); | ||||
|                         var daystr = string.Format("{0}-{1}-{2}", DateTime.Now.Year, monstr, dayval); | ||||
|                         var dt = DateTime.Parse(daystr); | ||||
|                         dr.pdate = dt.ToShortDateString(); | ||||
|                     } | ||||
| @@ -238,12 +248,17 @@ namespace FPJ0000.JobReport_ | ||||
|                         colidx = (int)(nudname.Value - 1); | ||||
|                         if (string.IsNullOrEmpty(dr.uid) == true) | ||||
|                         { | ||||
|                             var username = sheet.readStr(r, colidx); | ||||
|                             var users = dt_users.Select("name='" + username + "'"); | ||||
|                             dr.username = sheet.readStr(r, colidx); | ||||
|                             var users = dt_users.Select("name='" + dr.username + "'"); | ||||
|                             if (users.Length == 1) | ||||
|                             { | ||||
|                                 dr.uid = users[0]["id"].ToString(); | ||||
|                             } | ||||
|                             else | ||||
|                             { | ||||
|                                 if (unknownlist.Contains(dr.username) == false) | ||||
|                                     unknownlist.Add(dr.username); | ||||
|                             } | ||||
|                         } | ||||
|  | ||||
|                     } | ||||
| @@ -261,10 +276,23 @@ namespace FPJ0000.JobReport_ | ||||
|  | ||||
|             this.bn.BindingSource = this.bs; | ||||
|  | ||||
|             //기간을 정하낟. | ||||
|             var minDate = this.dsPRJ.JobReport.Min(t => t.pdate); | ||||
|             var maxDate = this.dsPRJ.JobReport.Max(t => t.pdate); | ||||
|             this.dateTimePicker2.Value = DateTime.Parse(minDate); | ||||
|             this.dateTimePicker1.Value = DateTime.Parse(maxDate); | ||||
|  | ||||
|             if (this.bs.Count < 1) | ||||
|             { | ||||
|                 FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다."); | ||||
|             } | ||||
|             if (unknownlist.Count > 0) | ||||
|             { | ||||
|                 FCOMMON.Util.MsgE("다음 사용자명의 계정이 확인되지 않습니다\n사용자를 먼저 등록하고 사용하세요\n" + | ||||
|                     string.Join("m",unknownlist) ); | ||||
|                 button3.Enabled = false; | ||||
|             } | ||||
|             else button3.Enabled = true; | ||||
|         } | ||||
|  | ||||
|  | ||||
| @@ -299,5 +327,29 @@ namespace FPJ0000.JobReport_ | ||||
|         { | ||||
|  | ||||
|         } | ||||
|  | ||||
|         private void button2_Click(object sender, EventArgs e) | ||||
|         { | ||||
|             var sd = dateTimePicker2.Value; | ||||
|             var ed = dateTimePicker1.Value; | ||||
|  | ||||
|             var dlg = FCOMMON.Util.MsgQ($"{sd.ToShortDateString()}~{ed.ToShortDateString()} 사이의 업로드된 자료를 삭제 할까요?"); | ||||
|             if (dlg != DialogResult.Yes) return; | ||||
|  | ||||
|  | ||||
|             var ta = new dsPRJTableAdapters.JobReportTableAdapter(); | ||||
|             if (this.cmbUser.SelectedValue == null || this.cmbUser.SelectedValue.ToString() == "--") | ||||
|             { | ||||
|                 var cnt = ta.DeleteImportAll(sd.ToShortDateString(), ed.ToShortDateString(), FCOMMON.info.Login.gcode); | ||||
|                 FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다"); | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 var uid = this.cmbUser.SelectedItem.ToString(); | ||||
|                 var cnt = ta.DeleteImport(sd.ToShortDateString(), ed.ToShortDateString(), uid, FCOMMON.info.Login.gcode); | ||||
|                 FCOMMON.Util.MsgI($"{cnt}건의 자료가 삭제 되었습니다"); | ||||
|             } | ||||
|  | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -123,6 +123,9 @@ namespace FPJ0000 | ||||
|             this.Show(); | ||||
|             Application.DoEvents(); | ||||
|             RefreshData(); | ||||
|             if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal; | ||||
|             if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0) | ||||
|                 this.Location = new Point(0, 0); | ||||
|         } | ||||
|  | ||||
|         string sortkey = string.Empty; | ||||
| @@ -820,22 +823,23 @@ namespace FPJ0000 | ||||
|             f.Show(); | ||||
|         } | ||||
|  | ||||
|         private void button4_Click(object sender, EventArgs e) | ||||
|         void showfolder() | ||||
|         { | ||||
|             var drv = this.bs.Current as DataRowView; | ||||
|             if (drv == null) return; | ||||
|             var dr = drv.Row as dsPRJ.ProjectsRow; | ||||
|  | ||||
|             var tbPath = dr.path; | ||||
|             if (tbPath == "") tbPath = "/" + tbIdx.Text; | ||||
|  | ||||
|             if (tbPath == "") tbPath = "/" + dr.idx.ToString(); | ||||
|  | ||||
|             if (tbPath.StartsWith("\\") == false) | ||||
|             { | ||||
|                 if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); | ||||
|                 else tbPath = "\\" + tbPath; | ||||
|             } | ||||
|  | ||||
|             var serverpath = @"\\10.131.32.33\Data\Project"; | ||||
|             //\\10.131.32.29\Data | ||||
|             var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project"); | ||||
|             if (System.IO.Directory.Exists(serverpath) == false) | ||||
|             { | ||||
|                 FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + | ||||
| @@ -846,10 +850,29 @@ namespace FPJ0000 | ||||
|             var path = serverpath + tbPath; | ||||
|             if (System.IO.Directory.Exists(path) == false) | ||||
|             { | ||||
|                 FCOMMON.Util.MsgE("프로젝트 저장소 없음"); | ||||
|                 try | ||||
|                 { | ||||
|                     System.IO.Directory.CreateDirectory(path); | ||||
|  | ||||
|                     string[] subdir = new string[] { "Source", "Document", "Draw", "Estimate" }; | ||||
|                     foreach (var dir in subdir) | ||||
|                         System.IO.Directory.CreateDirectory(path + "\\" + dir); | ||||
|  | ||||
|                 } | ||||
|                 catch (Exception eX) | ||||
|                 { | ||||
|                     FCOMMON.Util.MsgE("프로젝트 저장소 생성실패\n" + eX.Message); | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             FCOMMON.Util.RunExplorer(path); | ||||
|         } | ||||
|  | ||||
|  | ||||
|         private void button4_Click(object sender, EventArgs e) | ||||
|         { | ||||
|             showfolder(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -266,6 +266,7 @@ | ||||
|             //  | ||||
|             this.bindingNavigatorPositionItem.AccessibleName = "위치"; | ||||
|             this.bindingNavigatorPositionItem.AutoSize = false; | ||||
|             this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); | ||||
|             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; | ||||
|             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); | ||||
|             this.bindingNavigatorPositionItem.Text = "0"; | ||||
| @@ -388,6 +389,7 @@ | ||||
|             // 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); | ||||
| @@ -915,6 +917,7 @@ | ||||
|             // tbRequest | ||||
|             //  | ||||
|             this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; | ||||
|             this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); | ||||
|             this.tbRequest.Name = "tbRequest"; | ||||
|             this.tbRequest.Size = new System.Drawing.Size(120, 25); | ||||
|             this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||
|   | ||||
| @@ -231,33 +231,33 @@ | ||||
|     <value> | ||||
|         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 | ||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF | ||||
|         SKESs3abDTUZFRWWrimXuVLWWouRWW7pZGra0pb01b7Mvmy3Nt1aWxnd091nh+6WP9ULHg7u/TwPbz68 | ||||
|         qf/G5PyItltBGG3voe+fx8m+N9Ayrx6JYwm9ozFdz8jiQs/DKCzuCLoeREAl07+Qq3rDICdmJDCe2Pdc | ||||
|         L3Xa1wyjVwf9iBYn3I3kZ535GcSMhG7PVzLvm7sCJnAZlpmLoJCDYDh0aXbNAvNwhMyzoazeMLIlGA5e | ||||
|         8EsKqqwKVQWzC2Wdcqi7FBI/ZRsPiV0ZIvE0NGenVgqqrKUqJV3CGYab0DpqQPm5HSQo0D8WyhQ4JsNw | ||||
|         TITgmg7h7ZcE9rZPkAJ1b6lKQW/ntIP12GMuR/GpAshbtmDAF4ZN0Dj79wavP8VR0eKDitlZWUbLuUZX | ||||
|         HWR0IVdE520z3V5APLUM+yRLvA7+SwrIFvwGdl41tgNQdpeg+vo+HHUexmZ6A7eRXr9V2KjV/gFLyWU4 | ||||
|         p1jcmc6IGnrCIpFafVnN1UroPVoccdSgmC7g8psyYYHmgXdY/PYTd/2ZDe7P8IfkeswiW+pOJWRthSjS | ||||
|         5yH/+LqVsIDuxjwpGOKDQpgU3OQfIpsXwSVoTL4170B77SVifIH7aYR4PQG+QAjkalO757eYkdDAPEc0 | ||||
|         8QPsUhqfoykE2SSo3UYvciVruOcQMxKOWebGajsCydqOWVSf92P/mdV7+Uco6g8s4iy+4isZvgAAAABJ | ||||
|         SKESs3bThpqMigpL15TLXClrrcWwLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 | ||||
|         qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3r9ECdmJDDu6Pdc | ||||
|         L3Xa2wKDRwf9qBYnXI3kZ53pGcSMhB73VzLvn78Cxn8Z5tmLoJCDYDh0aW7NAtNImMyzoSyeELIlGA5e | ||||
|         8EkKqiwKVQWzC2Vdcqi7FRI/ZZ0Iil0ZwvE0NGenVwqqLKUqJV3CNY80oW2sGeXndpCgwMB4MFNgnwrB | ||||
|         PhmEcyaIt18S2NsxSQrUfaUqBb2d096txx5TOYpPFUDeugWD3hCsgibYvzd4/SmOilYvVMzOyjJazjU6 | ||||
|         6yCjC7kiOm+b8fYi4qll2KZY4rXzX1JAtuA3sPGqsR6AsqcE1df34ajjMDbTG7iN9PqtwkZttg+IJZfh | ||||
|         mGZxZyYjavgJi0Rq9WU1Vyuhd2txxF6DYrqAy2/KhAVaBt9h6dtPDPkyG9yf5Q/J+ZhFttRdSsjaC1Gk | ||||
|         z0P+8XUrYQHdjQVSMMwHhTApuMk/RDYvAjFojN4170B77SWifIHraZh43X6+QAjkalOH+7eYkdDAPEck | ||||
|         8QNsLI3PkRQCbBLUboMHuZI13LOLGQnHzPPjtZ3+ZG3nHKrP+7D/zOq9/CMU9Qcl8yy8OMWX5wAAAABJ | ||||
|         RU5ErkJggg== | ||||
| </value> | ||||
|   </data> | ||||
|   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||||
|     <value> | ||||
|         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 | ||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy | ||||
|         JB5MNF7ARIMJBw9UYlgUg2ERk0owCrILSpHQGkKq0BYQirTiUNo6LaUyFZgy01k6nc7zaxlFTUxcXuZl | ||||
|         lny/91+G+m8tjxYthkfOqpFfvDp2Mhh4fmR/sL8o7ye/LsqbnCzZZ+AU5e40KbqeAaCTK+vd57QcR3Sy | ||||
|         LLXmuqB8c2z+mhx2VYTpl8fOGzhF+YaLE7omQ4k2Qgw1QWQeQwoPQk9zJCsJXROId3bf09tgWTZFD5l8 | ||||
|         Bk5R/u6jfEbdIXArkoEW8B+qsTVbhvjcVXDeGnBLt8At3sS2p5K4gnTGwj90XDBwEjBQrKalDXC+Vmwv | ||||
|         1IN13IDEzpCqvFE9e0987yA7nmegUDbwbAcn1Nz8GYVYAjQxB2oSDSX2AD5fH6xONzomGPRMrcPuiSC7 | ||||
|         NwMnAa2mlK5J0Hg30pwN6uYgUhvtkNca4F3qxOg8i9XPIj5tKpgJ8hhf/IIRa4Nm4OQvWExKRuWhblmR | ||||
|         YrtyVeVIDaRQJfqdMSxHBcwyEpwhEdPE3piC3jcMDJyiPPcLZV3lCPwEynoT5HA1gSsg+i/n2g7EFTiD | ||||
|         SUwFkpigBcxHFHQ5onsBK3cKYlLCl6AdPZnkagcEfxsEuhHCx1r0kpmX10U4/Ltw1u/WFFjGVvYC6Nr8 | ||||
|         63T94W5f3aG4p75A/tGvhu9pMwEeCwRyMTLmSHXrewHmujbdVnXqohHxezXbmAMWO2MeILvom47hkf1t | ||||
|         xlxn0b3j7XC3lPLPyvNLjaN/rhdVZ664Hl7iQrZmjN0uEY3Pf6en5QdLx82nJfvdc3u7+DdR1FcpHSQI | ||||
|         6GT/VwAAAABJRU5ErkJggg== | ||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ | ||||
|         Eg8mGi9gosGEgwcmMUyEBMNLIxKMgrwFZUjYDEEIbAOEIZtQxja7MSadQEe7PtZ1/frfqKImJj6+6Td9 | ||||
|         5P/5/h6l/lvLwwWLoaHzavgXr42cDvhfHjsY6C3I+clvC3LGx4sOGDhFudpNiq6nAejkynjvOSXHEBkv | ||||
|         Sa47LynfHJ2/IYecZSH69YmLBk5R3sHCuK7JUCJ1EIP1EJmnkEL90FMcyUpA1wTi3b331A5Ylk3SAyav | ||||
|         gVOUr/M4n1Z3CdyEhL8R/MdKbM+WIDZ3HZynCtzSHXCLt7HjLicuI52x8A2cFAycBPQVqilpE5y3CTsL | ||||
|         1WAnbkFiZ0hV3qieuce/d5AZz92XLxt4poNTanb+tEIsAZqYBTWJhhJthtfbA6vDhbYxBl1TG7C7w8js | ||||
|         zcBJQJMpqWsSNN6FFGeDutWP5GYr5PVaeJbaMTzPYu2ziE9bCmYCPEYXv2DIWqMZOPkLLSYlrfJQt61I | ||||
|         sh3ZqnK4ClKwHL2OKJYjAmYZCY6giGliT1RB9yQDA6co94N8WVc5Aj+DslEPOVRJ4DKIvqvZtv0xBY5A | ||||
|         AlP+BMZoAfNhBR0Tkf2A1ft5USnuja+860on1tog+B5CoOsgrFjQTWZe3hAx4duDM36/rqBlZHU/gLbk | ||||
|         3qSrj3Z67x2Juavz5B/9ZrBWm/HzWCCQk5ExR6pbPwgwW5p1W8WZy0bE79VgYw612BlzH9lFz3QUT+yT | ||||
|         abPlse4ZbYWrsZh/UZpbbBz9c72qOHfN+egKF7Q1YORukWh8/js9Lz1cPGo+K9lrLuzv4t9EUV8BHlcj | ||||
|         /82UOg4AAAAASUVORK5CYII= | ||||
| </value> | ||||
|   </data> | ||||
|   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|   | ||||
							
								
								
									
										103
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										103
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -24777,7 +24777,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[5]; | ||||
|             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; | ||||
|             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, 
 | ||||
| @@ -24801,39 +24801,47 @@ ORDER BY pdate DESC"; | ||||
|             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||
|             this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             this._commandCollection[2].Connection = this.Connection; | ||||
|             this._commandCollection[2].CommandText = @"SELECT  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, 
 | ||||
|             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].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("@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  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, 
 | ||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') | ||||
| ORDER BY pdate DESC";
 | ||||
|             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.Current, 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.Current, false, null, "", "", "")); | ||||
|             this._commandCollection[2].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[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.Current, false, null, "", "", "")); | ||||
|             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             this._commandCollection[3].Connection = this.Connection; | ||||
|             this._commandCollection[3].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[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) 
 | ||||
|                AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) | ||||
| 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("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||
|             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||
|             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             this._commandCollection[4].Connection = this.Connection; | ||||
|             this._commandCollection[4].CommandText = @"SELECT  pidx, projectName, MAX(pdate) AS 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("@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
 | ||||
| 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[4].CommandType = global::System.Data.CommandType.Text; | ||||
|             this._commandCollection[4].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[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].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, "", "", "")); | ||||
|         } | ||||
|          | ||||
|         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
| @@ -24913,7 +24921,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[2]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[3]; | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; | ||||
|             } | ||||
| @@ -24950,7 +24958,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[2]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[3]; | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; | ||||
|             } | ||||
| @@ -24985,7 +24993,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[3]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[4]; | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; | ||||
|             } | ||||
| @@ -25022,7 +25030,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[3]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[4]; | ||||
|             if ((sd == null)) { | ||||
|                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; | ||||
|             } | ||||
| @@ -25057,7 +25065,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[4]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[5]; | ||||
|             if ((search == null)) { | ||||
|                 throw new global::System.ArgumentNullException("search"); | ||||
|             } | ||||
| @@ -25082,7 +25090,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[4]; | ||||
|             this.Adapter.SelectCommand = this.CommandCollection[5]; | ||||
|             if ((search == null)) { | ||||
|                 throw new global::System.ArgumentNullException("search"); | ||||
|             } | ||||
| @@ -25618,6 +25626,47 @@ ORDER BY projectName"; | ||||
|             } | ||||
|             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.Delete, false)] | ||||
|         public virtual int DeleteImportAll(string sd, string ed, string gcode) { | ||||
|             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; | ||||
|             if ((sd == null)) { | ||||
|                 command.Parameters[0].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 command.Parameters[0].Value = ((string)(sd)); | ||||
|             } | ||||
|             if ((ed == null)) { | ||||
|                 command.Parameters[1].Value = global::System.DBNull.Value; | ||||
|             } | ||||
|             else { | ||||
|                 command.Parameters[1].Value = ((string)(ed)); | ||||
|             } | ||||
|             if ((gcode == null)) { | ||||
|                 throw new global::System.ArgumentNullException("gcode"); | ||||
|             } | ||||
|             else { | ||||
|                 command.Parameters[2].Value = ((string)(gcode)); | ||||
|             } | ||||
|             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(); | ||||
|             } | ||||
|             int returnValue; | ||||
|             try { | ||||
|                 returnValue = command.ExecuteNonQuery(); | ||||
|             } | ||||
|             finally { | ||||
|                 if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { | ||||
|                     command.Connection.Close(); | ||||
|                 } | ||||
|             } | ||||
|             return returnValue; | ||||
|         } | ||||
|     } | ||||
|      | ||||
|     /// <summary> | ||||
|   | ||||
| @@ -921,14 +921,27 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r | ||||
|                     <CommandText>DELETE FROM JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1) AND (gcode = @gcode)</CommandText> | ||||
|                     <Parameters> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="user" ColumnName="wuid" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="user" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <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="Original" /> | ||||
|                     </Parameters> | ||||
|                   </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"> | ||||
|                 <DeleteCommand> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
|                     <CommandText>DELETE FROM JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND  (ISNULL(import, 0) = 1) AND (gcode = @gcode)</CommandText> | ||||
|                     <Parameters> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||
|                       <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="Original" /> | ||||
|                     </Parameters> | ||||
|                   </DbCommand> | ||||
|                 </DeleteCommand> | ||||
|               </DbSource> | ||||
|               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTagOnly" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTagOnly" GeneratorSourceName="FillByTagOnly" GetMethodModifier="Public" GetMethodName="GetByTagOnly" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTagOnly" UserSourceName="FillByTagOnly"> | ||||
|                 <SelectCommand> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
| @@ -2764,7 +2777,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|   <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ"> | ||||
|     <xs:complexType> | ||||
|       <xs:choice minOccurs="0" maxOccurs="unbounded"> | ||||
|         <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent"> | ||||
|         <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3031,7 +3044,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent"> | ||||
|         <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_RowClassName="ProjectsIOMapRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3075,7 +3088,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent"> | ||||
|         <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_RowClassName="ProjectsMailListRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3120,7 +3133,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent"> | ||||
|         <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_RowClassName="ProjectsPartRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3236,7 +3249,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent"> | ||||
|         <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3368,7 +3381,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent"> | ||||
|         <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_RowClassName="ProjectsHistoryRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3406,7 +3419,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent"> | ||||
|         <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" /> | ||||
| @@ -3522,7 +3535,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent" msprop:Generator_RowClassName="EETGW_NoteRow"> | ||||
|         <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_RowClassName="EETGW_NoteRow" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3573,7 +3586,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_RowClassName="SCTableRow" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowEvArgName="SCTableRowChangeEvent"> | ||||
|         <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_RowEvArgName="SCTableRowChangeEvent" msprop:Generator_RowClassName="SCTableRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3586,7 +3599,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_RowClassName="EETGW_SaveCostRow" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent"> | ||||
|         <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent" msprop:Generator_RowClassName="EETGW_SaveCostRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3758,7 +3771,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent" msprop:Generator_RowClassName="ProjectPartStatusRow"> | ||||
|         <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_RowClassName="ProjectPartStatusRow" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode"> | ||||
| @@ -3935,7 +3948,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow"> | ||||
|         <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -3980,7 +3993,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectToDoRow" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent"> | ||||
|         <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectToDoRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -4057,7 +4070,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow"> | ||||
|         <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -4244,11 +4257,11 @@ WHERE  (idx = @idx)</CommandText> | ||||
|                   </xs:restriction> | ||||
|                 </xs:simpleType> | ||||
|               </xs:element> | ||||
|               <xs:element name="refdata" msprop:Generator_ColumnVarNameInTable="columnrefdata" msprop:Generator_ColumnPropNameInRow="refdata" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="refdataColumn" msprop:Generator_UserColumnName="refdata" type="xs:boolean" minOccurs="0" /> | ||||
|               <xs:element name="refdata" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="refdata" msprop:Generator_ColumnVarNameInTable="columnrefdata" msprop:Generator_ColumnPropNameInTable="refdataColumn" msprop:Generator_UserColumnName="refdata" type="xs:boolean" minOccurs="0" /> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow"> | ||||
|         <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -4387,7 +4400,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent"> | ||||
|         <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
| @@ -4439,7 +4452,7 @@ WHERE  (idx = @idx)</CommandText> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|         <xs:element name="EETGW_ProjectReson" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectResonRow" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent"> | ||||
|         <xs:element name="EETGW_ProjectReson" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectReson" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectResonRow"> | ||||
|           <xs:complexType> | ||||
|             <xs:sequence> | ||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|      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="-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="300" 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="7" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> | ||||
|     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="6" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" /> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 chi
					chi