*패치리스트 화면 정리

*업무일지 자동입력화면 종료일자 저장안되는 버그 수정

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.07.28.1350")]
+[assembly: AssemblyVersion("21.08.03.0900")]
-[assembly: AssemblyFileVersion("21.07.28.1350")]
+[assembly: AssemblyFileVersion("21.08.03.0900")]

SubProject/FCM0000/Board/fPatchList.Designer.cs

@@ -30,9 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPatchList));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FCM0000.dsMSSQL();
@@ -47,23 +45,25 @@
             this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
-            this.boardBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton();
+            this.BTsAVE = new System.Windows.Forms.ToolStripButton();
             this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
             this.ta = new FCM0000.dsMSSQLTableAdapters.BoardTableAdapter();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.arDatagridView1 = new arCtl.arDatagridView();
+            this.wdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.urlDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -85,15 +85,15 @@
             this.bindingNavigatorSeparator2,
             this.bindingNavigatorAddNewItem,
             this.bindingNavigatorDeleteItem,
-            this.boardBindingNavigatorSaveItem});
+            this.BTsAVE});
-            this.bn.Location = new System.Drawing.Point(0, 550);
+            this.bn.Location = new System.Drawing.Point(0, 644);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(1046, 25);
+            this.bn.Size = new System.Drawing.Size(721, 25);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -101,6 +101,7 @@
             // 
             this.bs.DataMember = "Board";
             this.bs.DataSource = this.dsMSSQL;
+            this.bs.Sort = "WDATE DESC";
             // 
             // dsMSSQL
             // 
@@ -191,13 +192,13 @@
             this.bindingNavigatorAddNewItem.Text = "Add(&A)";
             this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
             // 
-            // boardBindingNavigatorSaveItem
+            // BTsAVE
             // 
-            this.boardBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("boardBindingNavigatorSaveItem.Image")));
+            this.BTsAVE.Image = ((System.Drawing.Image)(resources.GetObject("BTsAVE.Image")));
-            this.boardBindingNavigatorSaveItem.Name = "boardBindingNavigatorSaveItem";
+            this.BTsAVE.Name = "BTsAVE";
-            this.boardBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22);
+            this.BTsAVE.Size = new System.Drawing.Size(67, 22);
-            this.boardBindingNavigatorSaveItem.Text = "Save(&S)";
+            this.BTsAVE.Text = "Save(&S)";
-            this.boardBindingNavigatorSaveItem.Click += new System.EventHandler(this.boardBindingNavigatorSaveItem_Click);
+            this.BTsAVE.Click += new System.EventHandler(this.boardBindingNavigatorSaveItem_Click);
             // 
             // tam
             // 
@@ -205,6 +206,7 @@
             this.tam.BoardTableAdapter = this.ta;
             this.tam.CommonTableAdapter = null;
             this.tam.CustomsTableAdapter = null;
+            this.tam.EETGW_DocuFormTableAdapter = null;
             this.tam.HolidayLIstTableAdapter = null;
             this.tam.InventoryUserTableAdapter = null;
             this.tam.ItemsTableAdapter = null;
@@ -223,60 +225,12 @@
             this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "contents", true));
             this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.richTextBox1.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.richTextBox1.Location = new System.Drawing.Point(0, 450);
+            this.richTextBox1.Location = new System.Drawing.Point(0, 390);
             this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(1046, 100);
+            this.richTextBox1.Size = new System.Drawing.Size(721, 254);
             this.richTextBox1.TabIndex = 3;
             this.richTextBox1.Text = "";
             // 
-            // fpSpread1
-            // 
-            this.fpSpread1.AccessibleDescription = "";
-            this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.fpSpread1.Location = new System.Drawing.Point(0, 37);
-            this.fpSpread1.Name = "fpSpread1";
-            this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
-            this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(1046, 413);
-            this.fpSpread1.TabIndex = 4;
-            // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 3;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.AutoSortEnhancedContextMenu = true;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구분";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "제목";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청자";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F;
-            this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate";
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분";
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "title";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "제목";
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "url";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청자";
-            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
-            this.fpSpread1_Sheet1.DataAutoHeadings = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.RowMode;
-            this.fpSpread1_Sheet1.Protect = false;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -286,7 +240,7 @@
             this.toolStripButton2});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1046, 37);
+            this.toolStrip1.Size = new System.Drawing.Size(721, 37);
             this.toolStrip1.TabIndex = 9;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -295,8 +249,8 @@
             this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
             this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btSearch.Name = "btSearch";
-            this.btSearch.Size = new System.Drawing.Size(80, 34);
+            this.btSearch.Size = new System.Drawing.Size(104, 34);
-            this.btSearch.Text = "조회(&R)";
+            this.btSearch.Text = "새로고침(&R)";
             this.btSearch.Click += new System.EventHandler(this.btSearch_Click_1);
             // 
             // toolStripSeparator5
@@ -314,12 +268,73 @@
             this.toolStripButton2.Text = "닫기";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
             // 
+            // arDatagridView1
+            // 
+            this.arDatagridView1.A_DelCurrentCell = true;
+            this.arDatagridView1.A_EnterToTab = true;
+            this.arDatagridView1.A_KoreanField = null;
+            this.arDatagridView1.A_UpperField = null;
+            this.arDatagridView1.A_ViewRownumOnHeader = true;
+            this.arDatagridView1.AllowUserToAddRows = false;
+            this.arDatagridView1.AutoGenerateColumns = false;
+            this.arDatagridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
+            this.arDatagridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.arDatagridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.wdateDataGridViewTextBoxColumn,
+            this.cateDataGridViewTextBoxColumn,
+            this.titleDataGridViewTextBoxColumn,
+            this.urlDataGridViewTextBoxColumn});
+            this.arDatagridView1.DataSource = this.bs;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(3);
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.arDatagridView1.DefaultCellStyle = dataGridViewCellStyle2;
+            this.arDatagridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.arDatagridView1.Location = new System.Drawing.Point(0, 37);
+            this.arDatagridView1.Name = "arDatagridView1";
+            this.arDatagridView1.RowTemplate.Height = 23;
+            this.arDatagridView1.Size = new System.Drawing.Size(721, 353);
+            this.arDatagridView1.TabIndex = 10;
+            // 
+            // wdateDataGridViewTextBoxColumn
+            // 
+            this.wdateDataGridViewTextBoxColumn.DataPropertyName = "wdate";
+            this.wdateDataGridViewTextBoxColumn.HeaderText = "등록일";
+            this.wdateDataGridViewTextBoxColumn.Name = "wdateDataGridViewTextBoxColumn";
+            this.wdateDataGridViewTextBoxColumn.Width = 72;
+            // 
+            // cateDataGridViewTextBoxColumn
+            // 
+            this.cateDataGridViewTextBoxColumn.DataPropertyName = "cate";
+            this.cateDataGridViewTextBoxColumn.HeaderText = "구분";
+            this.cateDataGridViewTextBoxColumn.Name = "cateDataGridViewTextBoxColumn";
+            this.cateDataGridViewTextBoxColumn.Width = 57;
+            // 
+            // titleDataGridViewTextBoxColumn
+            // 
+            this.titleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.titleDataGridViewTextBoxColumn.DataPropertyName = "title";
+            this.titleDataGridViewTextBoxColumn.HeaderText = "화면";
+            this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
+            // 
+            // urlDataGridViewTextBoxColumn
+            // 
+            this.urlDataGridViewTextBoxColumn.DataPropertyName = "url";
+            this.urlDataGridViewTextBoxColumn.HeaderText = "요청";
+            this.urlDataGridViewTextBoxColumn.Name = "urlDataGridViewTextBoxColumn";
+            this.urlDataGridViewTextBoxColumn.Width = 57;
+            // 
             // fPatchList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1046, 575);
+            this.ClientSize = new System.Drawing.Size(721, 669);
-            this.Controls.Add(this.fpSpread1);
+            this.Controls.Add(this.arDatagridView1);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.bn);
@@ -331,10 +346,9 @@
             this.bn.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -357,14 +371,17 @@
         private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
         private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
         private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
-        private System.Windows.Forms.ToolStripButton boardBindingNavigatorSaveItem;
+        private System.Windows.Forms.ToolStripButton BTsAVE;
         private dsMSSQLTableAdapters.BoardTableAdapter ta;
         private System.Windows.Forms.RichTextBox richTextBox1;
-        private FarPoint.Win.Spread.FpSpread fpSpread1;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStrip toolStrip1;
         private System.Windows.Forms.ToolStripButton btSearch;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
         private System.Windows.Forms.ToolStripButton toolStripButton2;
+        private arCtl.arDatagridView arDatagridView1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn wdateDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn urlDataGridViewTextBoxColumn;
     }
 }

SubProject/FCM0000/Board/fPatchList.cs

@@ -34,14 +34,13 @@ namespace FCM0000
             if (FCOMMON.info.Login.level >= 9)
             {
                 bn.Enabled = true;
-                this.fpSpread1.EditMode = true;
+                BTsAVE.Enabled = true;
-                this.fpSpread1.ActiveSheet.Protect = false;
             }
             else
             {
                 bn.Enabled = false;
-                this.fpSpread1.EditMode = false;
+                BTsAVE.Enabled = false;
-                this.fpSpread1.ActiveSheet.Protect = true;
+                this.arDatagridView1.EditMode = DataGridViewEditMode.EditProgrammatically;
             }
             refreshData();
         }
@@ -64,7 +63,7 @@ namespace FCM0000
         {
             try
             {
-                this.ta.Fill(this.dsMSSQL.Board,5, FCOMMON.info.Login.gcode);
+                this.ta.Fill(this.dsMSSQL.Board,5, "%");
             }
             catch (System.Exception ex)
             {

SubProject/FCM0000/Board/fPatchList.resx

@@ -191,7 +191,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="boardBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BTsAVE.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
@@ -207,12 +207,6 @@
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>325, 17</value>
   </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>387, 17</value>
-  </metadata>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>387, 17</value>
-  </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>608, 17</value>
   </metadata>

SubProject/FCM0000/dsMSSQL.Designer.cs

@@ -12342,7 +12342,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate,
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT  idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate," +
                 " project, pidx, gcode\r\nFROM     Board\r\nWHERE  (bidx = @bidx) AND (ISNULL(header," +
-                " 0) = 0) AND (gcode = @gcode)\r\nORDER BY wdate";
+                " 0) = 0) AND (gcode LIKE @gcode)\r\nORDER BY wdate";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "bidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FCM0000/dsMSSQL.xsd

@@ -418,7 +418,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate,
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate, project, pidx, gcode
 FROM     Board
-WHERE  (bidx = @bidx) AND (ISNULL(header, 0) = 0) AND (gcode = @gcode)
+WHERE  (bidx = @bidx) AND (ISNULL(header, 0) = 0) AND (gcode LIKE @gcode)
 ORDER BY wdate</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="bidx" ColumnName="bidx" DataSourceName="EE.dbo.Board" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@bidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="bidx" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -464,7 +464,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, url, wuid, wdate,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Board" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -1626,7 +1626,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
   <xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
+        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
           <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" />
@@ -1718,7 +1718,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowClassName="CommonRow" msprop:Generator_UserTableName="Common" msprop:Generator_RowEvArgName="CommonRowChangeEvent">
+        <xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_UserTableName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_RowClassName="CommonRow">
           <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" />
@@ -1770,7 +1770,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_RowClassName="BoardRow" msprop:Generator_UserTableName="Board" msprop:Generator_RowEvArgName="BoardRowChangeEvent">
+        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_UserTableName="Board" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_RowEvArgName="BoardRowChangeEvent" msprop:Generator_RowClassName="BoardRow">
           <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" />
@@ -1838,7 +1838,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_RowClassName="RequestItemRow" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent">
+        <xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent" msprop:Generator_RowClassName="RequestItemRow">
           <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" />
@@ -1927,7 +1927,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_RowClassName="CustomsRow" msprop:Generator_UserTableName="Customs" msprop:Generator_RowEvArgName="CustomsRowChangeEvent">
+        <xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_UserTableName="Customs" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_RowEvArgName="CustomsRowChangeEvent" msprop:Generator_RowClassName="CustomsRow">
           <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" />
@@ -2040,7 +2040,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_RowClassName="StaffRow" msprop:Generator_UserTableName="Staff" msprop:Generator_RowEvArgName="StaffRowChangeEvent">
+        <xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_UserTableName="Staff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_RowEvArgName="StaffRowChangeEvent" msprop:Generator_RowClassName="StaffRow">
           <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" />
@@ -2105,7 +2105,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
+        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
           <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" />
@@ -2246,7 +2246,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="ddate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ddate" msprop:Generator_ColumnVarNameInTable="columnddate" msprop:Generator_ColumnPropNameInTable="ddateColumn" msprop:Generator_UserColumnName="ddate" minOccurs="0">
@@ -2367,7 +2367,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
+        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
           <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" />
@@ -2397,7 +2397,7 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent" msprop:Generator_RowClassName="InventoryUserRow">
+        <xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_RowClassName="InventoryUserRow" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent">
           <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" />
@@ -2474,32 +2474,32 @@ SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_DocuForm" msprop:Generator_TableClassName="EETGW_DocuFormDataTable" msprop:Generator_TableVarName="tableEETGW_DocuForm" msprop:Generator_TablePropName="EETGW_DocuForm" msprop:Generator_RowDeletingName="EETGW_DocuFormRowDeleting" msprop:Generator_RowChangingName="EETGW_DocuFormRowChanging" msprop:Generator_RowEvHandlerName="EETGW_DocuFormRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_DocuFormRowDeleted" msprop:Generator_UserTableName="EETGW_DocuForm" msprop:Generator_RowChangedName="EETGW_DocuFormRowChanged" msprop:Generator_RowEvArgName="EETGW_DocuFormRowChangeEvent" msprop:Generator_RowClassName="EETGW_DocuFormRow">
+        <xs:element name="EETGW_DocuForm" msprop:Generator_TableClassName="EETGW_DocuFormDataTable" msprop:Generator_TableVarName="tableEETGW_DocuForm" msprop:Generator_RowChangedName="EETGW_DocuFormRowChanged" msprop:Generator_TablePropName="EETGW_DocuForm" msprop:Generator_RowDeletingName="EETGW_DocuFormRowDeleting" msprop:Generator_RowChangingName="EETGW_DocuFormRowChanging" msprop:Generator_RowEvHandlerName="EETGW_DocuFormRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_DocuFormRowDeleted" msprop:Generator_RowClassName="EETGW_DocuFormRow" msprop:Generator_UserTableName="EETGW_DocuForm" msprop:Generator_RowEvArgName="EETGW_DocuFormRowChangeEvent">
           <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" />
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInRow="cate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate" minOccurs="0">
+              <xs:element name="cate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnVarNameInTable="columncate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_UserColumnName="cate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="title" msprop:Generator_ColumnVarNameInTable="columntitle" msprop:Generator_ColumnPropNameInRow="title" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:Generator_UserColumnName="title" minOccurs="0">
+              <xs:element name="title" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="title" msprop:Generator_ColumnVarNameInTable="columntitle" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:Generator_UserColumnName="title" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="body" msprop:Generator_ColumnVarNameInTable="columnbody" msprop:Generator_ColumnPropNameInRow="body" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="bodyColumn" msprop:Generator_UserColumnName="body" minOccurs="0">
+              <xs:element name="body" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="body" msprop:Generator_ColumnVarNameInTable="columnbody" msprop:Generator_ColumnPropNameInTable="bodyColumn" msprop:Generator_UserColumnName="body" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />

SubProject/FCM0000/dsMSSQL.xss

@@ -6,17 +6,17 @@
 </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="-12" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Items" ZOrder="2" X="48" Y="30" Height="590" Width="349" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="387" />
+    <Shape ID="DesignTable:Items" ZOrder="3" X="48" Y="30" Height="590" Width="349" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="387" />
-    <Shape ID="DesignTable:Common" ZOrder="3" X="443" Y="45" Height="267" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:Common" ZOrder="4" X="443" Y="45" Height="267" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Board" ZOrder="11" X="792" Y="69" Height="438" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="370" />
+    <Shape ID="DesignTable:Board" ZOrder="1" X="937" Y="65" Height="438" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="370" />
-    <Shape ID="DesignTable:RequestItem" ZOrder="10" X="1499" Y="70" Height="324" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RequestItem" ZOrder="11" X="1499" Y="70" Height="324" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Customs" ZOrder="9" X="1788" Y="70" Height="362" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Customs" ZOrder="10" X="1788" Y="70" Height="362" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Staff" ZOrder="8" X="2121" Y="70" Height="286" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:Staff" ZOrder="9" X="2121" Y="70" Height="286" Width="172" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:Purchase" ZOrder="7" X="2357" Y="30" Height="664" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="556" />
+    <Shape ID="DesignTable:Purchase" ZOrder="8" X="2357" Y="30" Height="664" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="556" />
-    <Shape ID="DesignTable:Projects" ZOrder="6" X="2672" Y="70" Height="628" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="541" />
+    <Shape ID="DesignTable:Projects" ZOrder="7" X="2672" Y="70" Height="628" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="541" />
-    <Shape ID="DesignTable:HolidayLIst" ZOrder="5" X="2988" Y="70" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="2988" Y="70" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:InventoryUser" ZOrder="4" X="3268" Y="70" Height="343" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:InventoryUser" ZOrder="5" X="3268" Y="70" Height="343" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_DocuForm" ZOrder="1" X="747" Y="396" Height="210" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:EETGW_DocuForm" ZOrder="2" X="747" Y="396" Height="210" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/JobReport_/fJobReportAI.cs

@@ -249,7 +249,7 @@ namespace FPJ0000
             var dr = drv.Row as dsPRJ.EETGW_JobReport_AutoInputRow;
             if (dr.uid != FCOMMON.info.Login.no && FCOMMON.info.Login.level < 5)
             {
-                FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
+                FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.\n관리자는 변경할 수 있습니다");
                 return;
             }
 

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs

@@ -118,8 +118,11 @@ namespace FPJ0000.JobReport_
             dts.Value = DateTime.Parse(dr.pdate);   //일자선택
 
             this.checkBox1.Checked = !dr.edate.isEmpty();
-            if (this.checkBox1.Checked) dte.Value = DateTime.Parse(dr.edate);
+            if (checkBox1.Checked) dte.Value = DateTime.Parse(dr.edate);
-
+            dte.Enabled = checkBox1.Checked;
+            checkBox1.CheckedChanged += (s1, e1) => {
+                dte.Enabled = checkBox1.Checked;
+            };
 
             cmbUser.SelectedValue = dr.uid;
             tbProject.Text = dr.projectName;
@@ -373,6 +376,9 @@ namespace FPJ0000.JobReport_
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;
 
+            //완료일자 적용 - 210803 chi  <= 김윤선p
+            if (checkBox1.Checked) dr.edate = dte.Value.ToShortDateString();
+            else dr.SetedateNull();
 
             //ot 시간을 초기화한다. -- 210728 김윤선
             if (double.TryParse(tbOt.Text, out double ot))