기타근무자 관련 코드 수정

Project/Dialog/fCommon.Designer.cs

@@ -0,0 +1,46 @@
+namespace Project.Dialog
+{
+    partial class fCommon
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // fHolyday
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1063, 567);
+            this.Name = "fHolyday";
+            this.Text = "근태입력";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

Project/Dialog/fCommon.cs

@@ -0,0 +1,86 @@
+using FCM0000.Mail;
+using FCOMMON;
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.WinForms;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Project.Dialog
+{
+    public partial class fCommon : fBase
+    {
+        private WebView2 webView21;
+        public fCommon()
+        {
+            InitializeComponent();
+
+
+            InitializeWebView2();
+
+
+        }
+        private void InitializeWebView2()
+        {
+            // 수동으로 WebView2 컨트롤 생성
+            this.webView21 = new WebView2();
+
+            // 기본 속성 설정
+            this.webView21.CreationProperties = null;
+            this.webView21.DefaultBackgroundColor = Color.White;
+            this.webView21.Dock = DockStyle.Fill;
+            this.webView21.Location = new Point(0, 0);
+            this.webView21.Name = "webView21";
+            this.webView21.Size = new Size(800, 600);
+            this.webView21.TabIndex = 0;
+            this.webView21.ZoomFactor = 1D;
+
+            // 폼에 추가
+            this.Controls.Add(this.webView21);
+
+            // 비동기 초기화
+            InitializeAsync();
+        }
+        private async void InitializeAsync()
+        {
+            try
+            {
+                // Fixed Version 경로 설정
+                string runtimePath = Path.Combine(Application.StartupPath, "WebView2Runtime");
+
+                if (Directory.Exists(runtimePath))
+                {
+                    var env = await CoreWebView2Environment.CreateAsync(runtimePath);
+                    await this.webView21.EnsureCoreWebView2Async(env);
+                }
+                else
+                {
+                    // 시스템에 설치된 WebView2 사용
+                    await this.webView21.EnsureCoreWebView2Async();
+                }
+                // OWIN 서버의 DashBoard 페이지로 연결
+                webView21.Source = new Uri($"{Pub.setting.WebServiceURL}/Common");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"WebView2 초기화 실패: {ex.Message}");
+            }
+        }
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            EnsureVisibleAndUsableSize();
+        }
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

Project/Dialog/fCommon.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Project/Dialog/fLogin.cs

@@ -254,10 +254,10 @@ namespace Project.Dialog
                 AddLoginInfo();
 
                 //210221
-                MakeAutoJobReportbyLogin();
+                Pub.MakeAutoJobReportbyLogin();
 
                 //210613    
-                MakeAutoJobReportByAuto();
+                Pub.MakeAutoJobReportByAuto();
 
                 DialogResult = DialogResult.OK;
                 FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds;
@@ -269,137 +269,6 @@ namespace Project.Dialog
             }
         }
 
-        /// <summary>
-        /// 무조건 업무일지를 자동으로 작성하는 경우
-        /// </summary>
-        void MakeAutoJobReportByAuto()
-        {
-            //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
-
-            var dbAI = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();//  EEEntitiesMain();
-            var dbGU = new dsMSSQLTableAdapters.vGroupUserTableAdapter();// EEEntitiesMain();
-            var dbHL = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
-            var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter();
-            var taQuery = new DSQueryTableAdapters.QueriesTableAdapter();
-
-            var nd = DateTime.Now.ToShortDateString();
-
-            //이 날짜가 휴일인지 체크한다.
-            var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
-            if (Holyinfo != null && Holyinfo.IsfreeNull() == false && Holyinfo.free == true) return;
-
-
-            //토,일은 처리하지 않음
-            if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
-
-            // db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
-            var rows = dbAI.GetActiveList(info.Login.gcode, "A", "%", nd);
-
-            foreach (var dr in rows)
-            {
-                //퇴사자 확인
-                var userdata = dbGU.GetByID(FCOMMON.info.Login.gcode, dr.uid).FirstOrDefault();// db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
-                if (userdata != null && userdata.IsoutdateNull() == false) continue;
-
-                //오늘자 자동생성된 데이터가 있다면 처리하지 않는다
-                if (taQuery.ExistAutoInputData(info.Login.gcode, dr.uid, nd) > 0) continue; //db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any())
-
-                //이데이터를 그대로 생성해준다.
-                var dtjr = new dsMSSQL.JobReportDataTable();
-                var newdr = dtjr.NewJobReportRow();
-                newdr.gcode = FCOMMON.info.Login.gcode;
-                newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
-                newdr.wdate = DateTime.Now;
-                newdr.pdate = nd;
-                newdr.import = false;
-                newdr.hrs = dr.hrs;
-                newdr.type = dr.type;//210305 누락분 추가
-                newdr.ot = dr.ot;
-                newdr.process = dr.process;
-                newdr.projectName = dr.projectName;
-                newdr.pidx = dr.pidx;
-                newdr.package = dr.package;
-                newdr.autoinput = true;
-                newdr.description = dr.description;
-                newdr.description2 = dr.description2;
-                newdr.remark = dr.remark;
-                newdr.requestpart = dr.requestpart;
-                newdr.status = dr.status;
-                newdr.tag = dr.tag;
-                newdr.uid = dr.uid;
-                dtjr.AddJobReportRow(newdr);
-                dbJR.Update(dtjr);
-            }
-            dbAI.Dispose();
-            dbGU.Dispose();
-            dbHL.Dispose();
-            dbJR.Dispose();
-            taQuery.Dispose();
-        }
-
-        /// <summary>
-        /// 로그인으로 업무일지를 작성하는 경우
-        /// </summary>
-        void MakeAutoJobReportbyLogin()
-        {
-            //자동로그인 업무일지 기록 기능 추가 = 210220
-            //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
-            var nd = DateTime.Now.ToShortDateString();
-
-            var taQ = new DSQueryTableAdapters.QueriesTableAdapter();
-            var exist = taQ.ExistAutoInputData(info.Login.gcode, info.Login.no, nd) > 0;
-            //var db = new EEEntitiesMain();
-
-            if (exist == false)
-            {
-                var taM = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();
-                var rows = taM.GetActiveList(info.Login.gcode, "L", info.Login.no, nd);
-
-                //var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && 
-                //t.enable == true && 
-                //t.autoinput == "L" && 
-                //t.uid == FCOMMON.info.Login.no && 
-                //t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
-
-                var newjob = new dsMSSQL.JobReportDataTable();
-                foreach (var dr in rows)
-                {
-                    //이데이터를 그대로 생성해준다.
-                    var newdr = newjob.NewJobReportRow();
-                    newdr.gcode = FCOMMON.info.Login.gcode;
-                    newdr.wuid = FCOMMON.info.Login.no;
-                    newdr.wdate = DateTime.Now;
-                    newdr.pdate = nd;
-                    newdr.import = false;
-                    if (dr.IshrsNull() == false) newdr.hrs = dr.hrs;
-                    if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가
-                    if (dr.IsotNull() == false) newdr.ot = dr.ot;
-                    if (dr.IsprocessNull() == false) newdr.process = dr.process;
-                    if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName;
-                    if (dr.IspidxNull() == false) newdr.pidx = dr.pidx;
-                    if (dr.IspackageNull() == false) newdr.package = dr.package;
-                     newdr.autoinput = true;
-                    if (dr.IsdescriptionNull() == false) newdr.description = dr.description;
-                    if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2;
-                    if (dr.IsremarkNull() == false) newdr.remark = dr.remark;
-                    if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart;
-                    if (dr.IsstatusNull() == false) newdr.status = dr.status;
-                    if (dr.IstagNull() == false) newdr.tag = dr.tag;
-                    if (dr.IsuidNull() == false) newdr.uid = dr.uid;
-                    newjob.AddJobReportRow(newdr);
-                }
-
-                if (newjob.Count() > 0)
-                {
-                    var taJ = new dsMSSQLTableAdapters.JobReportTableAdapter();
-                    var cnt = taJ.Update(newjob);
-                    //db.SaveChanges();
-                    Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" +
-                        "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
-                }
-            }
-        }
-
         void AddLoginInfo()
         {
             string ip = string.Empty;

Project/Dialog/fLogin_WB.cs

@@ -129,10 +129,10 @@ namespace Project.Dialog
                 AddLoginInfo();
 
                 //210221
-                MakeAutoJobReportbyLogin();
+                Pub.MakeAutoJobReportbyLogin();
 
                 //210613    
-                MakeAutoJobReportByAuto();
+                Pub.MakeAutoJobReportByAuto();
 
                 DialogResult = DialogResult.OK;
                 FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds;
@@ -373,10 +373,10 @@ namespace Project.Dialog
                 AddLoginInfo();
 
                 //210221
-                MakeAutoJobReportbyLogin();
+                Pub.MakeAutoJobReportbyLogin();
 
                 //210613    
-                MakeAutoJobReportByAuto();
+                Pub.MakeAutoJobReportByAuto();
 
                 DialogResult = DialogResult.OK;
                 FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds;
@@ -388,136 +388,7 @@ namespace Project.Dialog
             }
         }
 
-        /// <summary>
-        /// 무조건 업무일지를 자동으로 작성하는 경우
-        /// </summary>
-        void MakeAutoJobReportByAuto()
-        {
-            //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
         
-            var dbAI = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();//  EEEntitiesMain();
-            var dbGU = new dsMSSQLTableAdapters.vGroupUserTableAdapter();// EEEntitiesMain();
-            var dbHL = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
-            var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter();
-            var taQuery = new DSQueryTableAdapters.QueriesTableAdapter();
-
-            var nd = DateTime.Now.ToShortDateString();
-
-            //이 날짜가 휴일인지 체크한다.
-            var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
-            if (Holyinfo != null && Holyinfo.IsfreeNull() == false && Holyinfo.free == true) return;
-
-
-            //토,일은 처리하지 않음
-            if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
-
-            // db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
-            var rows = dbAI.GetActiveList(info.Login.gcode, "A", "%", nd);
-
-            foreach (var dr in rows)
-            {
-                //퇴사자 확인
-                var userdata = dbGU.GetByID(FCOMMON.info.Login.gcode, dr.uid).FirstOrDefault();// db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
-                if (userdata != null && userdata.IsoutdateNull() == false) continue;
-
-                //오늘자 자동생성된 데이터가 있다면 처리하지 않는다
-                if (taQuery.ExistAutoInputData(info.Login.gcode, dr.uid, nd) > 0) continue; //db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any())
-
-                //이데이터를 그대로 생성해준다.
-                var dtjr = new dsMSSQL.JobReportDataTable();
-                var newdr = dtjr.NewJobReportRow();
-                newdr.gcode = FCOMMON.info.Login.gcode;
-                newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
-                newdr.wdate = DateTime.Now;
-                newdr.pdate = nd;
-                newdr.import = false;
-                newdr.hrs = dr.hrs;
-                newdr.type = dr.type;//210305 누락분 추가
-                newdr.ot = dr.ot;
-                newdr.process = dr.process;
-                newdr.projectName = dr.projectName;
-                newdr.pidx = dr.pidx;
-                newdr.package = dr.package;
-                newdr.autoinput = true;
-                newdr.description = dr.description;
-                newdr.description2 = dr.description2;
-                newdr.remark = dr.remark;
-                newdr.requestpart = dr.requestpart;
-                newdr.status = dr.status;
-                newdr.tag = dr.tag;
-                newdr.uid = dr.uid;
-                dtjr.AddJobReportRow(newdr);
-                dbJR.Update(dtjr);
-            }
-            dbAI.Dispose();
-            dbGU.Dispose();
-            dbHL.Dispose();
-            dbJR.Dispose();
-            taQuery.Dispose();
-        }
-
-        /// <summary>
-        /// 로그인으로 업무일지를 작성하는 경우
-        /// </summary>
-        void MakeAutoJobReportbyLogin()
-        {
-            //자동로그인 업무일지 기록 기능 추가 = 210220
-            //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
-            var nd = DateTime.Now.ToShortDateString();
-
-            var taQ = new DSQueryTableAdapters.QueriesTableAdapter();
-            var exist = taQ.ExistAutoInputData(info.Login.gcode, info.Login.no, nd) > 0;
-            //var db = new EEEntitiesMain();
-
-            if (exist == false)
-            {
-                var taM = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();
-                var rows = taM.GetActiveList(info.Login.gcode, "L", info.Login.no, nd);
-
-                //var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && 
-                //t.enable == true && 
-                //t.autoinput == "L" && 
-                //t.uid == FCOMMON.info.Login.no && 
-                //t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
-
-                var newjob = new dsMSSQL.JobReportDataTable();
-                foreach (var dr in rows)
-                {
-                    //이데이터를 그대로 생성해준다.
-                    var newdr = newjob.NewJobReportRow();
-                    newdr.gcode = FCOMMON.info.Login.gcode;
-                    newdr.wuid = FCOMMON.info.Login.no;
-                    newdr.wdate = DateTime.Now;
-                    newdr.pdate = nd;
-                    newdr.import = false;
-                    if (dr.IshrsNull() == false) newdr.hrs = dr.hrs;
-                    if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가
-                    if (dr.IsotNull() == false) newdr.ot = dr.ot;
-                    if (dr.IsprocessNull() == false) newdr.process = dr.process;
-                    if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName;
-                    if (dr.IspidxNull() == false) newdr.pidx = dr.pidx;
-                    if (dr.IspackageNull() == false) newdr.package = dr.package;
-                     newdr.autoinput = true;
-                    if (dr.IsdescriptionNull() == false) newdr.description = dr.description;
-                    if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2;
-                    if (dr.IsremarkNull() == false) newdr.remark = dr.remark;
-                    if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart;
-                    if (dr.IsstatusNull() == false) newdr.status = dr.status;
-                    if (dr.IstagNull() == false) newdr.tag = dr.tag;
-                    if (dr.IsuidNull() == false) newdr.uid = dr.uid;
-                    newjob.AddJobReportRow(newdr);
-                }
-
-                if (newjob.Count() > 0)
-                {
-                    var taJ = new dsMSSQLTableAdapters.JobReportTableAdapter();
-                    var cnt = taJ.Update(newjob);
-                    //db.SaveChanges();
-                    Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" +
-                        "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
-                }
-            }
-        }
 
         void AddLoginInfo()
         {

Project/EETGW.csproj

@@ -259,6 +259,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Dialog\fCommon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialog\fCommon.Designer.cs">
+      <DependentUpon>fCommon.cs</DependentUpon>
+    </Compile>
     <Compile Include="Dialog\fHolyday.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -286,6 +292,7 @@
     <Compile Include="Web\Controller\BaseController.cs" />
     <Compile Include="Web\Controller\APIController.cs" />
     <Compile Include="Web\Controller\DashBoardController.cs" />
+    <Compile Include="Web\Controller\CommonController.cs" />
     <Compile Include="Web\Controller\KuntaeController.cs" />
     <Compile Include="Web\Controller\ManualController.cs" />
     <Compile Include="Web\Controller\ProjectController.cs" />
@@ -481,6 +488,9 @@
     <EmbeddedResource Include="Dev\fDisableItem.resx">
       <DependentUpon>fDisableItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Dialog\fCommon.resx">
+      <DependentUpon>fCommon.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Dialog\fHolyday.resx">
       <DependentUpon>fHolyday.cs</DependentUpon>
     </EmbeddedResource>
@@ -663,6 +673,9 @@
     <Content Include="Web\wwwroot\DashBoard\index.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Web\wwwroot\Common.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="Web\wwwroot\Jobreport\index.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Project/Pub.cs

@@ -30,6 +30,141 @@ namespace Project
         public static CResult Result = new CResult();
         public static DatabaseConnectionString.DatabaseInfo dbinfo = null;
 
+
+
+        /// <summary>
+        /// 무조건 업무일지를 자동으로 작성하는 경우
+        /// </summary>
+        public static void MakeAutoJobReportByAuto()
+        {
+            //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
+
+            var dbAI = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();//  EEEntitiesMain();
+            var dbGU = new dsMSSQLTableAdapters.vGroupUserTableAdapter();// EEEntitiesMain();
+            var dbHL = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
+            var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter();
+            var taQuery = new DSQueryTableAdapters.QueriesTableAdapter();
+
+            var nd = DateTime.Now.ToShortDateString();
+
+            //이 날짜가 휴일인지 체크한다.
+            var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
+            if (Holyinfo != null && Holyinfo.IsfreeNull() == false && Holyinfo.free == true) return;
+
+
+            //토,일은 처리하지 않음
+            if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
+
+            // db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
+            var rows = dbAI.GetActiveList(FCOMMON.info.Login.gcode, "A", "%", nd);
+
+            foreach (var dr in rows)
+            {
+                //퇴사자 확인
+                var userdata = dbGU.GetByID(FCOMMON.info.Login.gcode, dr.uid).FirstOrDefault();// db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
+                if (userdata != null && userdata.IsoutdateNull() == false) continue;
+
+                //오늘자 자동생성된 데이터가 있다면 처리하지 않는다
+                if (taQuery.ExistAutoInputData(FCOMMON.info.Login.gcode, dr.uid, nd) > 0) continue; //db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any())
+
+                //이데이터를 그대로 생성해준다.
+                var dtjr = new dsMSSQL.JobReportDataTable();
+                var newdr = dtjr.NewJobReportRow();
+                newdr.gcode = FCOMMON.info.Login.gcode;
+                newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
+                newdr.wdate = DateTime.Now;
+                newdr.pdate = nd;
+                newdr.import = false;
+                newdr.hrs = dr.hrs;
+                newdr.type = dr.type;//210305 누락분 추가
+                newdr.ot = dr.ot;
+                newdr.process = dr.process;
+                newdr.projectName = dr.projectName;
+                newdr.pidx = dr.pidx;
+                newdr.package = dr.package;
+                newdr.autoinput = true;
+                newdr.description = dr.description;
+                newdr.description2 = dr.description2;
+                newdr.remark = dr.remark;
+                newdr.requestpart = dr.requestpart;
+                newdr.status = "진행 완료";
+                newdr.tag = dr.tag;
+                newdr.uid = dr.uid;
+                dtjr.AddJobReportRow(newdr);
+                dbJR.Update(dtjr);
+            }
+            dbAI.Dispose();
+            dbGU.Dispose();
+            dbHL.Dispose();
+            dbJR.Dispose();
+            taQuery.Dispose();
+        }
+
+        /// <summary>
+        /// 로그인으로 업무일지를 작성하는 경우
+        /// </summary>
+        public static void MakeAutoJobReportbyLogin()
+        {
+            //자동로그인 업무일지 기록 기능 추가 = 210220
+            //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
+            var nd = DateTime.Now.ToShortDateString();
+
+            var taQ = new DSQueryTableAdapters.QueriesTableAdapter();
+            var exist = taQ.ExistAutoInputData(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, nd) > 0;
+            //var db = new EEEntitiesMain();
+
+            if (exist == false)
+            {
+                var taM = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();
+                var rows = taM.GetActiveList(FCOMMON.info.Login.gcode, "L", FCOMMON.info.Login.no, nd);
+
+                //var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && 
+                //t.enable == true && 
+                //t.autoinput == "L" && 
+                //t.uid == FCOMMON.info.Login.no && 
+                //t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
+
+                var newjob = new dsMSSQL.JobReportDataTable();
+                foreach (var dr in rows)
+                {
+                    //이데이터를 그대로 생성해준다.
+                    var newdr = newjob.NewJobReportRow();
+                    newdr.gcode = FCOMMON.info.Login.gcode;
+                    newdr.wuid = FCOMMON.info.Login.no;
+                    newdr.wdate = DateTime.Now;
+                    newdr.pdate = nd;
+                    newdr.import = false;
+                    if (dr.IshrsNull() == false) newdr.hrs = dr.hrs;
+                    if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가
+                    if (dr.IsotNull() == false) newdr.ot = dr.ot;
+                    if (dr.IsprocessNull() == false) newdr.process = dr.process;
+                    if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName;
+                    if (dr.IspidxNull() == false) newdr.pidx = dr.pidx;
+                    if (dr.IspackageNull() == false) newdr.package = dr.package;
+                    newdr.autoinput = true;
+                    if (dr.IsdescriptionNull() == false) newdr.description = dr.description;
+                    if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2;
+                    if (dr.IsremarkNull() == false) newdr.remark = dr.remark;
+                    if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart;
+                    if (dr.IsstatusNull() == false) newdr.status = dr.status;
+                    if (dr.IstagNull() == false) newdr.tag = dr.tag;
+                    if (dr.IsuidNull() == false) newdr.uid = dr.uid;
+                    newjob.AddJobReportRow(newdr);
+                }
+
+                if (newjob.Count() > 0)
+                {
+                    var taJ = new dsMSSQLTableAdapters.JobReportTableAdapter();
+                    var cnt = taJ.Update(newjob);
+                    //db.SaveChanges();
+                    Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" +
+                        "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
+                }
+            }
+        }
+
+
+
         public static void init()
         {
             FCOMMON.info.Path = Util.CurrentPath;
@@ -76,7 +211,7 @@ namespace Project
             webView21.ZoomFactor = 1D;
 
             // 비동기 초기화
-             InitializeAsync();
+            InitializeAsync();
         }
         async private static void InitializeAsync()
         {

Project/Web/Controller/CommonController.cs

@@ -0,0 +1,108 @@
+using FCM0000;
+using Microsoft.Owin;
+using Newtonsoft.Json;
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+
+namespace Project.Web.Controllers
+{
+    public class CommonController : BaseController
+    {
+        [HttpGet]
+        public HttpResponseMessage GetList(string grp=null)
+        {
+            var sql = string.Empty;
+            sql = "select *" +
+                " from common" +
+                " where gcode = @gcode" +
+                " and grp = @grp" +
+                " order by code,svalue";
+
+            var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
+            var cn = new System.Data.SqlClient.SqlConnection(cs);
+            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            cmd.Parameters.AddWithValue("gcode", FCOMMON.info.Login.gcode);
+
+            // 날짜 파라미터가 없으면 기본값 사용 (현재 월)
+            var grpCode = !string.IsNullOrEmpty(grp) ? grp : "99";
+            cmd.Parameters.AddWithValue("grp", grpCode);
+
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            var dt = new System.Data.DataTable();
+            da.Fill(dt);
+            da.Dispose();
+            cmd.Dispose();
+            cn.Dispose();
+
+            var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            });
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+            txtjson,
+           System.Text.Encoding.UTF8,
+           "application/json")
+            };
+
+            return resp;
+        }
+
+
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            // 직접 파일을 읽어서 반환
+            var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot",  "Common.html");
+            var contents = string.Empty;
+
+            if (System.IO.File.Exists(filePath))
+            {
+                contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
+            }
+            else
+            {
+                // 파일이 없으면 404 에러 페이지 또는 기본 메시지
+                contents = "<html><body><h1>404 - File Not Found</h1><p>The requested file was not found: " + filePath + "</p></body></html>";
+            }
+
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              contents,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+
+       
+    }
+
+    public class CommonModel
+    {
+      
+
+        public int idx { get; set; }                    // 데이터고유번호
+        public string gcode { get; set; }               // 그룹코드(데이터 그룹간 식별)
+        public string grp { get; set; }                 // 코드그룹
+        public string code { get; set; }               // 코드
+        public string svalue { get; set; }                // 값(문자열)
+        public int ivalue { get; set; }               // 값(숫자)
+        public float fvalue { get; set; }               // 값(실수)
+        public string memo { get; set; }               // 비고
+        public string svalue2 { get; set; }               // 값2(문자열)
+        public string wuid { get; set; }                // 데이터기록자 사원번호
+        public string wdate { get; set; }               // 데이터를기록한일시
+    }
+}
+
+
+

Project/Web/Controller/DashBoardController.cs

@@ -31,7 +31,7 @@ namespace Project.Web.Controllers
         public string TodayCountH()
         {
 
-            var sql = "select count(*) from EETGW_HolydayRequest " +
+            var sql = "select count(*) from EETGW_HolydayRequest WITH (nolock) " +
                 " where gcode  =  @gcode and isnull(conf,0) = 1 " +
                 " and sdate <= convert(varchar(10),GETDATE(),120) and edate >= convert(varchar(10),GETDATE(),120)";
 
@@ -55,7 +55,7 @@ namespace Project.Web.Controllers
             {
                 var cn = DBM.getCn();
 
-                var sql = "select  count(*) from  EETGW_HolydayRequest" +
+                var sql = "select  count(*) from  EETGW_HolydayRequest WITH (nolock) " +
                 " where gcode = @gcode" +
                 " and isnull(conf,0) = 0";
 
@@ -90,7 +90,7 @@ namespace Project.Web.Controllers
         {
             var sql = string.Empty;
             sql = $" select uid,cate,sdate,edate,HolyReason,Users.name,holydays,holytimes,remark " +
-                  $" from EETGW_HolydayRequest INNER JOIN " +
+                  $" from EETGW_HolydayRequest WITH (nolock) INNER JOIN " +
                   $" Users ON EETGW_HolydayRequest.uid = Users.id " +
                   $" where EETGW_HolydayRequest.gcode  = @gcode" +
                   $" and isnull(conf,0) = 0  ";
@@ -142,7 +142,7 @@ namespace Project.Web.Controllers
 
             sql = $" select idx,pdate,status,projectName, uid, requestpart, package,type,process,description," +
                 " hrs,ot,otStart,otEnd" +
-                " from JobReport" +
+                " from JobReport WITH (nolock)" +
                 " where gcode = @gcode and uid = @uid" +
                 " and pdate between @startDate and @endDate" +
                 " order by pdate desc, wdate desc";
@@ -188,10 +188,12 @@ namespace Project.Web.Controllers
             {
                 var cn = DBM.getCn();
 
-                var sql = "select  count(*) " +
+            
-                " from  EETGW_GroupUser" +
+
-                " where gcode = @gcode" +
+                var sql = "select  count(*) from vGroupUser WITH (nolock) " +
-                " and useUserState = 1 and useJobReport =1";
+                     " where gcode = @gcode and useUserState = 1 and useJobReport = 1" +
+                     " and id not in (select uid from vEETGW_TodayNoneWorkUser where gcode = @gcode and kunmu = 0)";
+
 
                 cn.Open();
 
@@ -276,12 +278,9 @@ namespace Project.Web.Controllers
         public HttpResponseMessage GetholyUser()
         {
             var sql = string.Empty;
-            sql = $" select uid,cate,sdate,edate,HolyReason,Users.name " +
+            sql = $" select uid,type,cate,sdate,edate,title,dbo.getusername(uid) as name " +
-                  $" from EETGW_HolydayRequest INNER JOIN " +
+                  $" from vEETGW_TodayNoneWorkUser WITH (nolock)" +
-                  $" Users ON EETGW_HolydayRequest.uid = Users.id " +
+                  $" where gcode = @gcode and kunmu=0";
-                  $" where EETGW_HolydayRequest.gcode  = @gcode" +
-                  $" and conf = 1 " +
-                  $" and sdate <= convert(varchar(10),GETDATE(),120) and edate >= convert(varchar(10),GETDATE(),120)";
 
             //sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
 
@@ -317,7 +316,9 @@ namespace Project.Web.Controllers
         {
             try
             {
-                var sql = "select * from vGroupUser where gcode = @gcode and useUserState = 1 and useJobReport = 1";
+                var sql = "select * from vGroupUser WITH (nolock) " +
+                        " where gcode = @gcode and useUserState = 1 and useJobReport = 1" +
+                        " and id not in (select uid from vEETGW_TodayNoneWorkUser where gcode = @gcode and kunmu = 0)";
 
                 var cs = Properties.Settings.Default.gwcs;
                 var cn = new System.Data.SqlClient.SqlConnection(cs);
@@ -360,7 +361,7 @@ namespace Project.Web.Controllers
         {
             try
             {
-                var sql = "select pdate, process, pumname, pumscale, pumunit, pumqtyreq, pumprice, pumamt from Purchase where gcode = @gcode and state = '---' order by pdate desc";
+                var sql = "select pdate, process, pumname, pumscale, pumunit, pumqtyreq, pumprice, pumamt from Purchase WITH (nolock) where gcode = @gcode and state = '---' order by pdate desc";
 
                 var cs = Properties.Settings.Default.gwcs;
                 var cn = new System.Data.SqlClient.SqlConnection(cs);
@@ -385,7 +386,6 @@ namespace Project.Web.Controllers
                         System.Text.Encoding.UTF8,
                         "application/json")
                 };
-
                 return resp;
             }
             catch (Exception ex)
@@ -403,7 +403,10 @@ namespace Project.Web.Controllers
         {
             try
             {
-                var sql = "select pdate, process, pumname, pumscale, pumunit, pumqtyreq, pumprice, pumamt from EETGW_PurchaseCR where gcode = @gcode and state = '---' order by pdate desc";
+                var sql = "select pdate, process, pumname, pumscale, pumunit, pumqtyreq, pumprice, pumamt " +
+                    " from EETGW_PurchaseCR WITH (nolock) " +
+                    " where gcode = @gcode and state = '---'" +
+                    " order by pdate desc";
 
                 var cs = Properties.Settings.Default.gwcs;
                 var cn = new System.Data.SqlClient.SqlConnection(cs);

Project/Web/wwwroot/Common.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Expires" content="0">
+    <title>공용코드관리</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script>
+        tailwind.config = {
+            theme: {
+                extend: {
+                    colors: {
+                        primary: '#3B82F6',
+                        secondary: '#6B7280',
+                        success: '#10B981',
+                        danger: '#EF4444',
+                        warning: '#F59E0B'
+                    }
+                }
+            }
+        }
+    </script>
+</head>
+<body class="bg-gray-50 min-h-screen">
+intro file
+</body>
+</html> 

Project/Web/wwwroot/DashBoard/index.html

@@ -144,7 +144,7 @@
             <div class="glass-effect rounded-2xl p-6 card-hover animate-slide-up cursor-pointer" onclick="showPresentUserModal()">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-white/70 text-sm font-medium">출근</p>
+                        <p class="text-white/70 text-sm font-medium">출근(대상)</p>
                         <p class="text-3xl font-bold text-white" id="presentCount">0</p>
                     </div>
                     <div class="w-12 h-12 bg-success-500/20 rounded-full flex items-center justify-center">
@@ -225,7 +225,7 @@
                     <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"></path>
                     </svg>
-                    휴가자 현황
+                    휴가/기타 현황
                 </h2>
             </div>
             <div class="overflow-x-auto">
@@ -233,7 +233,8 @@
                     <thead class="bg-white/10">
                         <tr>
                             <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">이름</th>
-                            <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">휴가 종류</th>
+                            <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">형태</th>
+                            <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">종류</th>
                             <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">시작일</th>
                             <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">종료일</th>
                             <th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">사유</th>
@@ -483,17 +484,35 @@
                 let tableRows = '';
                 if (data && data.length > 0) {
                     data.forEach(item => {
+                        // 형태에 따른 색상 결정
+                        const typeColorClass = (item.type === '휴가') ? 'bg-green-500/20 text-green-300' : 'bg-warning-500/20 text-warning-300';
+                        
+                        // 종류에 따른 색상 결정
+                        let cateColorClass = 'bg-warning-500/20 text-warning-300'; // 기본값
+                        if (item.cate === '휴가') {
+                            cateColorClass = 'bg-warning-500/20 text-warning-300'; // 노란색 계열
+                        } else if (item.cate === '파견') {
+                            cateColorClass = 'bg-purple-500/20 text-purple-300'; // 보라색 계열
+                        } else {
+                            cateColorClass = 'bg-warning-500/20 text-warning-300'; // 기타는 주황색 계열
+                        }
+                        
                         tableRows += `
                             <tr class="hover:bg-white/5 transition-colors">
                                 <td class="px-6 py-4 whitespace-nowrap text-white">${item.name || '-'}(${item.uid})</td>
+                                 <td class="px-6 py-4 whitespace-nowrap">
+                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${typeColorClass}">
+                                        ${item.type || '-'}
+                                    </span>
+                                </td>
                                 <td class="px-6 py-4 whitespace-nowrap">
-                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-warning-500/20 text-warning-300">
+                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${cateColorClass}">
                                         ${item.cate || '-'}
                                     </span>
                                 </td>
                                 <td class="px-6 py-4 whitespace-nowrap text-white/80">${item.sdate || '-'}</td>
                                 <td class="px-6 py-4 whitespace-nowrap text-white/80">${item.edate || '-'}</td>
-                                <td class="px-6 py-4 text-white/80">${item.HolyReason || '-'}</td>
+                                <td class="px-6 py-4 text-white/80">${item.title || '-'}</td>
                             </tr>
                         `;
                     });

Project/fMain.Designer.cs

@@ -40,6 +40,7 @@
             this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
             this.sbLoginUseTime = new System.Windows.Forms.ToolStripStatusLabel();
+            this.sbWeb = new System.Windows.Forms.ToolStripStatusLabel();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.btSetting = new System.Windows.Forms.ToolStripMenuItem();
             this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,8 +75,9 @@
             this.목록ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.자동입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem18 = new System.Windows.Forms.ToolStripSeparator();
             this.업무분류및형태설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
             this.업무현황전자실ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.교육목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -151,7 +153,6 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-            this.sbWeb = new System.Windows.Forms.ToolStripStatusLabel();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -221,6 +222,12 @@
             this.sbLoginUseTime.Size = new System.Drawing.Size(68, 17);
             this.sbLoginUseTime.Text = "LOGINTIME";
             // 
+            // sbWeb
+            // 
+            this.sbWeb.Name = "sbWeb";
+            this.sbWeb.Size = new System.Drawing.Size(31, 17);
+            this.sbWeb.Text = "WEB";
+            // 
             // menuStrip1
             // 
             this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F);
@@ -493,54 +500,62 @@
             // 
             this.mn_dailyhistory.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.목록ToolStripMenuItem1,
-            this.자동입력ToolStripMenuItem,
             this.양식ToolStripMenuItem,
-            this.toolStripMenuItem2,
+            this.toolStripMenuItem18,
-            this.업무분류및형태설정ToolStripMenuItem});
+            this.업무분류및형태설정ToolStripMenuItem,
+            this.자동입력ToolStripMenuItem,
+            this.toolStripMenuItem2});
             this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image")));
             this.mn_dailyhistory.Name = "mn_dailyhistory";
             this.mn_dailyhistory.Size = new System.Drawing.Size(203, 24);
-            this.mn_dailyhistory.Text = "업무일지";
+            this.mn_dailyhistory.Text = "업무관리";
             this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click);
             // 
             // 목록ToolStripMenuItem1
             // 
             this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
-            this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(214, 24);
+            this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(234, 24);
-            this.목록ToolStripMenuItem1.Text = "목록";
+            this.목록ToolStripMenuItem1.Text = "업무일지";
             this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click);
             // 
             // 자동입력ToolStripMenuItem
             // 
             this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
-            this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
+            this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(234, 24);
-            this.자동입력ToolStripMenuItem.Text = "자동입력";
+            this.자동입력ToolStripMenuItem.Text = "기타업무(파견,출장) 등록";
             this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click);
             // 
             // 양식ToolStripMenuItem
             // 
             this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem";
-            this.양식ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
+            this.양식ToolStripMenuItem.Size = new System.Drawing.Size(234, 24);
-            this.양식ToolStripMenuItem.Text = "양식";
+            this.양식ToolStripMenuItem.Text = "업무일지 등록양식";
             this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click);
             // 
-            // toolStripMenuItem2
+            // toolStripMenuItem18
             // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem18.Name = "toolStripMenuItem18";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(211, 6);
+            this.toolStripMenuItem18.Size = new System.Drawing.Size(231, 6);
             // 
             // 업무분류및형태설정ToolStripMenuItem
             // 
             this.업무분류및형태설정ToolStripMenuItem.Name = "업무분류및형태설정ToolStripMenuItem";
-            this.업무분류및형태설정ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
+            this.업무분류및형태설정ToolStripMenuItem.Size = new System.Drawing.Size(234, 24);
             this.업무분류및형태설정ToolStripMenuItem.Text = "업무분류 및 형태설정";
             this.업무분류및형태설정ToolStripMenuItem.Click += new System.EventHandler(this.업무분류및형태설정ToolStripMenuItem_Click);
             // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(231, 6);
+            // 
             // 업무현황전자실ToolStripMenuItem
             // 
+            this.업무현황전자실ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
             this.업무현황전자실ToolStripMenuItem.Name = "업무현황전자실ToolStripMenuItem";
             this.업무현황전자실ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
             this.업무현황전자실ToolStripMenuItem.Text = "업무현황(전자실)";
+            this.업무현황전자실ToolStripMenuItem.Visible = false;
             this.업무현황전자실ToolStripMenuItem.Click += new System.EventHandler(this.업무현황전자실ToolStripMenuItem_Click);
             // 
             // 교육목록ToolStripMenuItem
@@ -1175,12 +1190,6 @@
             this.toolStripButton3.ToolTipText = "휴가신청";
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
-            // sbWeb
-            // 
-            this.sbWeb.Name = "sbWeb";
-            this.sbWeb.Size = new System.Drawing.Size(31, 17);
-            this.sbWeb.Text = "WEB";
-            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1333,6 +1342,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem17;
         private System.Windows.Forms.ToolStripMenuItem webview2TestToolStripMenuItem;
         private System.Windows.Forms.ToolStripStatusLabel sbWeb;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem18;
     }
 }
 

Project/fMain.cs

@@ -1519,5 +1519,6 @@ namespace Project
             using (var f = new Dialog.fWebView2Test())
                 f.ShowDialog();
         }
+
     }
 }

Project/fMain.resx

@@ -452,16 +452,16 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAICSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
         h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/UdOf/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP
+        /U7m/E+5XP8/92TF/3lzYj/UdOb/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP
         /0Mzc/4/6kz7f3VS5k+QGAyb7A49wbBE5xpUJxQs1RUsvtVdB1PUcaj+//XSiP/7W+3/Xi/0+tyzrRBu
         QPGtrgsg9VCdCFB8s3suTFHlpY5l5wtDDl5Odvt2MUjt/7YKp73FFzs+guQKbva8g2pBBTAXFN3sKQHx
         X7RGiD8u8/x/JUPrz5NsG7XCm736QNs/F93qOQ/WgA6K7/QYF9/oOg7lMjwu9vR8VOrxH4xLvDxAYkBX
         lgItagErwAaK73SLQZkMTyq8smAGPKn0zgSJ1d+v58i9NZEPrIAQeFTh2fek3Os/CD8u9+qFChMPgP7f
         CPdCqccGqDBx4P/+eo4XXVGn3/TE/Qfhl52Rp0BiUGns4N+Bfs2/B3r7/h/oPXP/QO9vIP0fGUPFzoDV
-        7O/RgGoDatw2kR0oOP/8hPp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ
+        7O/RgGoDatw2kR0oOP9sX/0/dE24MEjt3wM980B6Gf7u7+3FpogYDNILdHqfLdC05UCBVaRgkJ5/B/ps
-        AgBRa6pzQEH+NwAAAABJRU5ErkJggg==
+        AUV3qmn514jSAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FPJ0000/JobReport_/fJobReportAI.Designer.cs

@@ -30,23 +30,23 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReportAI));
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = 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 FPJ0000.dsPRJ();
@@ -68,6 +68,7 @@
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.tbFind = new System.Windows.Forms.ToolStripTextBox();
             this.btFind = new System.Windows.Forms.ToolStripButton();
+            this.btDebug = new System.Windows.Forms.ToolStripButton();
             this.cm = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -84,22 +85,21 @@
             this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.cmbProcess = new System.Windows.Forms.ToolStripComboBox();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_AutoInputTableAdapter();
-            this.btDebug = new System.Windows.Forms.ToolStripButton();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -144,7 +144,7 @@
             // 
             this.bs.DataMember = "EETGW_JobReport_AutoInput";
             this.bs.DataSource = this.dsMSSQL;
-            this.bs.Sort = "enable,pdate desc";
+            this.bs.Sort = "enable desc,pdate desc";
             // 
             // dsMSSQL
             // 
@@ -292,6 +292,16 @@
             this.btFind.Text = "toolStripButton2";
             this.btFind.Click += new System.EventHandler(this.btFind_Click);
             // 
+            // btDebug
+            // 
+            this.btDebug.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btDebug.Image = ((System.Drawing.Image)(resources.GetObject("btDebug.Image")));
+            this.btDebug.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btDebug.Name = "btDebug";
+            this.btDebug.Size = new System.Drawing.Size(147, 22);
+            this.btDebug.Text = "로그인데이터자동생성";
+            this.btDebug.Click += new System.EventHandler(this.btDebug_Click);
+            // 
             // cm
             // 
             this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
@@ -424,129 +434,6 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 17;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            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.Cells.Get(0, 3).Value = "종료일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "WW";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "담당";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청부서";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "패키지";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "상태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "업무형태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "업무분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "시간";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "비고";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "#";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "enable";
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "사용";
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "autoinput";
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "방식";
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType15;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate";
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작일";
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "edate";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "종료일";
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ww";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "WW";
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "username";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "담당";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "requestpart";
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "요청부서";
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "package";
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "패키지";
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 86F;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "상태";
-            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType22;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "type";
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "업무형태";
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 84F;
-            this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType23;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "업무분류";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 80F;
-            this.fpSpread1_Sheet1.Columns.Get(11).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType24;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "projectName";
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 158F;
-            this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pidx";
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pidx";
-            this.fpSpread1_Sheet1.Columns.Get(12).Width = 39F;
-            numberCellType5.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "hrs";
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "시간";
-            this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ot";
-            this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType25;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "description";
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "비고";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType26;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "tag";
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "#";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            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);
@@ -598,15 +485,132 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // btDebug
+            // fpSpread1_Sheet1
             // 
-            this.btDebug.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.fpSpread1_Sheet1.Reset();
-            this.btDebug.Image = ((System.Drawing.Image)(resources.GetObject("btDebug.Image")));
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            this.btDebug.ImageTransparentColor = System.Drawing.Color.Magenta;
+            // Formulas and custom names must be loaded with R1C1 reference style
-            this.btDebug.Name = "btDebug";
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.btDebug.Size = new System.Drawing.Size(147, 22);
+            this.fpSpread1_Sheet1.ColumnCount = 17;
-            this.btDebug.Text = "로그인데이터자동생성";
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
-            this.btDebug.Click += new System.EventHandler(this.btDebug_Click);
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "사용";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "출근\r\n여부";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "근무형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "시작일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "종료일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "WW";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "담당자";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).ColumnSpan = 7;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "업무일지 자동 생성 양식";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "패키지";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "업무형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "업무분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트(아이템)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "생성\r\n방식";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "요청부서";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "패키지";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "프로젝트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 31F;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "enable";
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 67F;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "kunmu";
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pdate";
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 58F;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ww";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "username";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "requestpart";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "요청부서";
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "package";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "패키지";
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 86F;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "상태";
+            this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "type";
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "형태";
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 84F;
+            this.fpSpread1_Sheet1.Columns.Get(11).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "분류";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 80F;
+            this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "projectName";
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "프로젝트";
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 158F;
+            this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "*";
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(13).Width = 39F;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "autoinput";
+            this.fpSpread1_Sheet1.Columns.Get(14).Width = 52F;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "description";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "tag";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
             // fJobReportAI
             // 
@@ -627,9 +631,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -680,7 +684,7 @@
         private System.Windows.Forms.ToolStripComboBox cmbProcess;
         private dsPRJTableAdapters.EETGW_JobReport_AutoInputTableAdapter ta;
         private System.Windows.Forms.ToolStripButton btSearch;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripButton btDebug;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReportAI.resx

@@ -228,9 +228,6 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>252, 17</value>
   </metadata>

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.Designer.cs

@@ -29,7 +29,6 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.Label hrsLabel;
             System.Windows.Forms.Label typeLabel;
             System.Windows.Forms.Label label1;
             System.Windows.Forms.Label projectLabel;
@@ -38,9 +37,7 @@
             System.Windows.Forms.Label label5;
             System.Windows.Forms.Label label3;
             System.Windows.Forms.Label label6;
-            System.Windows.Forms.Label label2;
             System.Windows.Forms.Label label7;
-            this.tbHrs = new System.Windows.Forms.TextBox();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsPRJ = new FPJ0000.dsPRJ();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
@@ -51,10 +48,9 @@
             this.dts = new System.Windows.Forms.DateTimePicker();
             this.cmbUser = new System.Windows.Forms.ComboBox();
             this.tbProjectIndex = new System.Windows.Forms.TextBox();
-            this.tbOt = new System.Windows.Forms.TextBox();
             this.tbWW = new System.Windows.Forms.TextBox();
             this.cmbjobproc = new System.Windows.Forms.ComboBox();
-            this.cmbState = new System.Windows.Forms.ComboBox();
+            this.cmbGrp26 = new System.Windows.Forms.ComboBox();
             this.cmbPackage = new System.Windows.Forms.ComboBox();
             this.cmbRequest = new System.Windows.Forms.ComboBox();
             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
@@ -62,6 +58,8 @@
             this.tbProject = new System.Windows.Forms.ComboBox();
             this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.chkKunmu = new System.Windows.Forms.CheckBox();
+            this.cmbjobgrp = new System.Windows.Forms.ComboBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.dte = new System.Windows.Forms.DateTimePicker();
             this.tbWeekE = new System.Windows.Forms.TextBox();
@@ -69,8 +67,9 @@
             this.radAuto = new System.Windows.Forms.RadioButton();
             this.radLogin = new System.Windows.Forms.RadioButton();
             this.tbTag = new System.Windows.Forms.TextBox();
-            this.cmbjobgrp = new System.Windows.Forms.ComboBox();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            hrsLabel = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
             typeLabel = new System.Windows.Forms.Label();
             label1 = new System.Windows.Forms.Label();
             projectLabel = new System.Windows.Forms.Label();
@@ -79,117 +78,99 @@
             label5 = new System.Windows.Forms.Label();
             label3 = new System.Windows.Forms.Label();
             label6 = new System.Windows.Forms.Label();
-            label2 = new System.Windows.Forms.Label();
             label7 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
-            // hrsLabel
-            // 
-            hrsLabel.AutoSize = true;
-            hrsLabel.Location = new System.Drawing.Point(16, 189);
-            hrsLabel.Name = "hrsLabel";
-            hrsLabel.Size = new System.Drawing.Size(53, 12);
-            hrsLabel.TabIndex = 16;
-            hrsLabel.Text = "근무시간";
-            // 
             // typeLabel
             // 
             typeLabel.AutoSize = true;
-            typeLabel.Location = new System.Drawing.Point(16, 120);
+            typeLabel.Location = new System.Drawing.Point(18, 102);
             typeLabel.Name = "typeLabel";
-            typeLabel.Size = new System.Drawing.Size(53, 12);
+            typeLabel.Size = new System.Drawing.Size(74, 21);
             typeLabel.TabIndex = 13;
             typeLabel.Text = "업무형태";
             // 
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(15, 94);
+            label1.Location = new System.Drawing.Point(18, 67);
             label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(53, 12);
+            label1.Size = new System.Drawing.Size(74, 21);
             label1.TabIndex = 10;
             label1.Text = "요청부서";
             // 
             // projectLabel
             // 
             projectLabel.AutoSize = true;
-            projectLabel.Location = new System.Drawing.Point(15, 68);
+            projectLabel.Location = new System.Drawing.Point(18, 32);
             projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             projectLabel.Name = "projectLabel";
-            projectLabel.Size = new System.Drawing.Size(53, 12);
+            projectLabel.Size = new System.Drawing.Size(74, 21);
             projectLabel.TabIndex = 7;
             projectLabel.Text = "프로젝트";
             // 
             // label4
             // 
             label4.AutoSize = true;
-            label4.Location = new System.Drawing.Point(321, 41);
+            label4.Location = new System.Drawing.Point(35, 67);
             label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label4.Name = "label4";
-            label4.Size = new System.Drawing.Size(41, 12);
+            label4.Size = new System.Drawing.Size(58, 21);
             label4.TabIndex = 5;
             label4.Text = "담당자";
             // 
             // stateLabel
             // 
             stateLabel.AutoSize = true;
-            stateLabel.Location = new System.Drawing.Point(333, 12);
+            stateLabel.Location = new System.Drawing.Point(408, 67);
             stateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             stateLabel.Name = "stateLabel";
-            stateLabel.Size = new System.Drawing.Size(29, 12);
+            stateLabel.Size = new System.Drawing.Size(74, 21);
             stateLabel.TabIndex = 3;
-            stateLabel.Text = "상태";
+            stateLabel.Text = "근무형태";
             // 
             // label5
             // 
             label5.AutoSize = true;
-            label5.Location = new System.Drawing.Point(27, 12);
+            label5.Location = new System.Drawing.Point(34, 33);
             label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label5.Name = "label5";
-            label5.Size = new System.Drawing.Size(41, 12);
+            label5.Size = new System.Drawing.Size(58, 21);
             label5.TabIndex = 0;
             label5.Text = "시작일";
             // 
             // label3
             // 
             label3.AutoSize = true;
-            label3.Location = new System.Drawing.Point(331, 94);
+            label3.Location = new System.Drawing.Point(430, 67);
             label3.Name = "label3";
-            label3.Size = new System.Drawing.Size(41, 12);
+            label3.Size = new System.Drawing.Size(58, 21);
             label3.TabIndex = 10;
             label3.Text = "패키지";
             // 
             // label6
             // 
             label6.AutoSize = true;
-            label6.Location = new System.Drawing.Point(319, 148);
+            label6.Location = new System.Drawing.Point(414, 103);
             label6.Name = "label6";
-            label6.Size = new System.Drawing.Size(53, 12);
+            label6.Size = new System.Drawing.Size(74, 21);
             label6.TabIndex = 13;
             label6.Text = "프로세스";
             // 
-            // label2
+            // label7
             // 
-            label2.AutoSize = true;
+            label7.AutoSize = true;
-            label2.Location = new System.Drawing.Point(177, 189);
+            label7.Location = new System.Drawing.Point(50, 137);
-            label2.Name = "label2";
+            label7.Name = "label7";
-            label2.Size = new System.Drawing.Size(53, 12);
+            label7.Size = new System.Drawing.Size(42, 21);
-            label2.TabIndex = 16;
+            label7.TabIndex = 62;
-            label2.Text = "초과시간";
+            label7.Text = "분류";
-            // 
-            // tbHrs
-            // 
-            this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
-            this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbHrs.Location = new System.Drawing.Point(73, 179);
-            this.tbHrs.Name = "tbHrs";
-            this.tbHrs.Size = new System.Drawing.Size(77, 33);
-            this.tbHrs.TabIndex = 17;
-            this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // bs
             // 
@@ -208,7 +189,7 @@
             this.lbIndex});
             this.statusStrip1.Location = new System.Drawing.Point(0, 659);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(850, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(831, 22);
             this.statusStrip1.TabIndex = 28;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -228,18 +209,18 @@
             // 
             this.cmbjobtype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbjobtype.FormattingEnabled = true;
-            this.cmbjobtype.Location = new System.Drawing.Point(73, 116);
+            this.cmbjobtype.Location = new System.Drawing.Point(99, 98);
             this.cmbjobtype.Name = "cmbjobtype";
-            this.cmbjobtype.Size = new System.Drawing.Size(626, 20);
+            this.cmbjobtype.Size = new System.Drawing.Size(300, 29);
             this.cmbjobtype.TabIndex = 14;
             this.cmbjobtype.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
             // 
             // btSave
             // 
             this.btSave.BackColor = System.Drawing.Color.SkyBlue;
-            this.btSave.Location = new System.Drawing.Point(706, 8);
+            this.btSave.Location = new System.Drawing.Point(685, 12);
             this.btSave.Name = "btSave";
-            this.btSave.Size = new System.Drawing.Size(133, 132);
+            this.btSave.Size = new System.Drawing.Size(134, 68);
             this.btSave.TabIndex = 20;
             this.btSave.Text = "확인";
             this.btSave.UseVisualStyleBackColor = false;
@@ -247,10 +228,10 @@
             // 
             // dts
             // 
-            this.dts.Location = new System.Drawing.Point(73, 8);
+            this.dts.Location = new System.Drawing.Point(99, 29);
             this.dts.Margin = new System.Windows.Forms.Padding(4);
             this.dts.Name = "dts";
-            this.dts.Size = new System.Drawing.Size(178, 21);
+            this.dts.Size = new System.Drawing.Size(229, 29);
             this.dts.TabIndex = 1;
             this.dts.ValueChanged += new System.EventHandler(this.dtPdate_ValueChanged);
             // 
@@ -261,43 +242,30 @@
             this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbUser.FormattingEnabled = true;
             this.cmbUser.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.cmbUser.Location = new System.Drawing.Point(378, 37);
+            this.cmbUser.Location = new System.Drawing.Point(99, 63);
             this.cmbUser.Margin = new System.Windows.Forms.Padding(4);
             this.cmbUser.Name = "cmbUser";
-            this.cmbUser.Size = new System.Drawing.Size(321, 20);
+            this.cmbUser.Size = new System.Drawing.Size(300, 29);
             this.cmbUser.TabIndex = 6;
-            this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
             // 
             // tbProjectIndex
             // 
-            this.tbProjectIndex.Location = new System.Drawing.Point(635, 64);
+            this.tbProjectIndex.Location = new System.Drawing.Point(723, 27);
             this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4);
             this.tbProjectIndex.Name = "tbProjectIndex";
             this.tbProjectIndex.ReadOnly = true;
-            this.tbProjectIndex.Size = new System.Drawing.Size(64, 21);
+            this.tbProjectIndex.Size = new System.Drawing.Size(64, 29);
             this.tbProjectIndex.TabIndex = 9;
             this.tbProjectIndex.TabStop = false;
             this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // tbOt
-            // 
-            this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true));
-            this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbOt.ForeColor = System.Drawing.Color.Red;
-            this.tbOt.Location = new System.Drawing.Point(236, 179);
-            this.tbOt.Name = "tbOt";
-            this.tbOt.Size = new System.Drawing.Size(77, 33);
-            this.tbOt.TabIndex = 17;
-            this.tbOt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.tbOt.TextChanged += new System.EventHandler(this.tbOt_TextChanged);
-            // 
             // tbWW
             // 
-            this.tbWW.Location = new System.Drawing.Point(253, 8);
+            this.tbWW.Location = new System.Drawing.Point(336, 29);
             this.tbWW.Margin = new System.Windows.Forms.Padding(4);
             this.tbWW.Name = "tbWW";
             this.tbWW.ReadOnly = true;
-            this.tbWW.Size = new System.Drawing.Size(63, 21);
+            this.tbWW.Size = new System.Drawing.Size(63, 29);
             this.tbWW.TabIndex = 2;
             this.tbWW.TabStop = false;
             this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -306,37 +274,37 @@
             // 
             this.cmbjobproc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbjobproc.FormattingEnabled = true;
-            this.cmbjobproc.Location = new System.Drawing.Point(378, 144);
+            this.cmbjobproc.Location = new System.Drawing.Point(487, 99);
             this.cmbjobproc.Name = "cmbjobproc";
-            this.cmbjobproc.Size = new System.Drawing.Size(321, 20);
+            this.cmbjobproc.Size = new System.Drawing.Size(300, 29);
             this.cmbjobproc.TabIndex = 15;
             // 
-            // cmbState
+            // cmbGrp26
             // 
-            this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.cmbGrp26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.cmbState.FormattingEnabled = true;
+            this.cmbGrp26.FormattingEnabled = true;
-            this.cmbState.Location = new System.Drawing.Point(378, 8);
+            this.cmbGrp26.Location = new System.Drawing.Point(486, 63);
-            this.cmbState.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbGrp26.Margin = new System.Windows.Forms.Padding(4);
-            this.cmbState.Name = "cmbState";
+            this.cmbGrp26.Name = "cmbGrp26";
-            this.cmbState.Size = new System.Drawing.Size(321, 20);
+            this.cmbGrp26.Size = new System.Drawing.Size(300, 29);
-            this.cmbState.TabIndex = 4;
+            this.cmbGrp26.TabIndex = 4;
             // 
             // cmbPackage
             // 
             this.cmbPackage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPackage.FormattingEnabled = true;
-            this.cmbPackage.Location = new System.Drawing.Point(378, 90);
+            this.cmbPackage.Location = new System.Drawing.Point(487, 63);
             this.cmbPackage.Name = "cmbPackage";
-            this.cmbPackage.Size = new System.Drawing.Size(321, 20);
+            this.cmbPackage.Size = new System.Drawing.Size(300, 29);
             this.cmbPackage.TabIndex = 12;
             // 
             // cmbRequest
             // 
             this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbRequest.FormattingEnabled = true;
-            this.cmbRequest.Location = new System.Drawing.Point(73, 90);
+            this.cmbRequest.Location = new System.Drawing.Point(99, 63);
             this.cmbRequest.Name = "cmbRequest";
-            this.cmbRequest.Size = new System.Drawing.Size(240, 20);
+            this.cmbRequest.Size = new System.Drawing.Size(300, 29);
             this.cmbRequest.TabIndex = 11;
             // 
             // ta
@@ -345,7 +313,9 @@
             // 
             // tam
             // 
+            this.tam.AuthTableAdapter = null;
             this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.EETGW_DocuFormTableAdapter = null;
             this.tam.EETGW_JobReport_AutoInputTableAdapter = null;
             this.tam.EETGW_JobReport_EBoardTableAdapter = null;
             this.tam.EETGW_NoteTableAdapter = null;
@@ -372,9 +342,9 @@
             this.tbProject.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbProject.FormattingEnabled = true;
-            this.tbProject.Location = new System.Drawing.Point(72, 64);
+            this.tbProject.Location = new System.Drawing.Point(99, 28);
             this.tbProject.Name = "tbProject";
-            this.tbProject.Size = new System.Drawing.Size(556, 20);
+            this.tbProject.Size = new System.Drawing.Size(617, 29);
             this.tbProject.TabIndex = 55;
             // 
             // richTextBoxEx1
@@ -388,7 +358,7 @@
             this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
             this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBoxEx1.FilePath = "";
-            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 224);
+            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 374);
             this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
@@ -396,56 +366,51 @@
     "Ex1\\par\r\n}\r\n";
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;
-            this.richTextBoxEx1.Size = new System.Drawing.Size(850, 414);
+            this.richTextBoxEx1.Size = new System.Drawing.Size(831, 264);
             this.richTextBoxEx1.TabIndex = 58;
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            this.panel1.Controls.Add(label7);
+            this.panel1.Controls.Add(this.groupBox2);
-            this.panel1.Controls.Add(this.cmbjobgrp);
+            this.panel1.Controls.Add(this.groupBox1);
-            this.panel1.Controls.Add(this.checkBox1);
+            this.panel1.Controls.Add(this.chkKunmu);
-            this.panel1.Controls.Add(this.dte);
-            this.panel1.Controls.Add(this.tbWeekE);
             this.panel1.Controls.Add(this.chkEnable);
-            this.panel1.Controls.Add(this.radAuto);
-            this.panel1.Controls.Add(this.radLogin);
-            this.panel1.Controls.Add(this.dts);
-            this.panel1.Controls.Add(this.tbHrs);
-            this.panel1.Controls.Add(this.tbProject);
-            this.panel1.Controls.Add(label2);
-            this.panel1.Controls.Add(hrsLabel);
-            this.panel1.Controls.Add(this.cmbjobtype);
-            this.panel1.Controls.Add(label5);
-            this.panel1.Controls.Add(typeLabel);
-            this.panel1.Controls.Add(label6);
-            this.panel1.Controls.Add(this.cmbPackage);
             this.panel1.Controls.Add(this.btSave);
-            this.panel1.Controls.Add(this.cmbRequest);
-            this.panel1.Controls.Add(label1);
-            this.panel1.Controls.Add(this.cmbState);
-            this.panel1.Controls.Add(label3);
-            this.panel1.Controls.Add(stateLabel);
-            this.panel1.Controls.Add(this.cmbUser);
-            this.panel1.Controls.Add(this.cmbjobproc);
-            this.panel1.Controls.Add(this.tbProjectIndex);
-            this.panel1.Controls.Add(this.tbWW);
-            this.panel1.Controls.Add(projectLabel);
-            this.panel1.Controls.Add(label4);
-            this.panel1.Controls.Add(this.tbOt);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(850, 224);
+            this.panel1.Size = new System.Drawing.Size(831, 374);
             this.panel1.TabIndex = 59;
-            this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
+            // 
+            // chkKunmu
+            // 
+            this.chkKunmu.AutoSize = true;
+            this.chkKunmu.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
+            this.chkKunmu.Location = new System.Drawing.Point(18, 47);
+            this.chkKunmu.Name = "chkKunmu";
+            this.chkKunmu.Size = new System.Drawing.Size(617, 25);
+            this.chkKunmu.TabIndex = 64;
+            this.chkKunmu.Text = "출근 (체크하지 않는 경우 출근 대상자에서 제외되며, 관리자 메일이 발송 됩니다)";
+            this.toolTip1.SetToolTip(this.chkKunmu, "근무가 체크된 데이터는 등록시 관리자 메일이 발송됩니다.");
+            this.chkKunmu.UseVisualStyleBackColor = true;
+            // 
+            // cmbjobgrp
+            // 
+            this.cmbjobgrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbjobgrp.FormattingEnabled = true;
+            this.cmbjobgrp.Location = new System.Drawing.Point(99, 133);
+            this.cmbjobgrp.Name = "cmbjobgrp";
+            this.cmbjobgrp.Size = new System.Drawing.Size(300, 29);
+            this.cmbjobgrp.TabIndex = 63;
             // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(8, 39);
+            this.checkBox1.Location = new System.Drawing.Point(405, 31);
             this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(60, 16);
+            this.checkBox1.Size = new System.Drawing.Size(77, 25);
             this.checkBox1.TabIndex = 61;
             this.checkBox1.Text = "종료일";
             this.checkBox1.UseVisualStyleBackColor = true;
@@ -453,20 +418,20 @@
             // 
             // dte
             // 
-            this.dte.Location = new System.Drawing.Point(72, 37);
+            this.dte.Location = new System.Drawing.Point(487, 29);
             this.dte.Margin = new System.Windows.Forms.Padding(4);
             this.dte.Name = "dte";
-            this.dte.Size = new System.Drawing.Size(178, 21);
+            this.dte.Size = new System.Drawing.Size(229, 29);
             this.dte.TabIndex = 59;
             this.dte.ValueChanged += new System.EventHandler(this.dte_ValueChanged);
             // 
             // tbWeekE
             // 
-            this.tbWeekE.Location = new System.Drawing.Point(252, 37);
+            this.tbWeekE.Location = new System.Drawing.Point(723, 29);
             this.tbWeekE.Margin = new System.Windows.Forms.Padding(4);
             this.tbWeekE.Name = "tbWeekE";
             this.tbWeekE.ReadOnly = true;
-            this.tbWeekE.Size = new System.Drawing.Size(63, 21);
+            this.tbWeekE.Size = new System.Drawing.Size(63, 29);
             this.tbWeekE.TabIndex = 60;
             this.tbWeekE.TabStop = false;
             this.tbWeekE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -474,19 +439,20 @@
             // chkEnable
             // 
             this.chkEnable.AutoSize = true;
-            this.chkEnable.Location = new System.Drawing.Point(444, 187);
+            this.chkEnable.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold);
+            this.chkEnable.Location = new System.Drawing.Point(18, 14);
             this.chkEnable.Name = "chkEnable";
-            this.chkEnable.Size = new System.Drawing.Size(48, 16);
+            this.chkEnable.Size = new System.Drawing.Size(407, 25);
             this.chkEnable.TabIndex = 57;
-            this.chkEnable.Text = "사용";
+            this.chkEnable.Text = "사용 (기능을 사용해야 업무일지가 자동 작성됩니다)";
-            this.chkEnable.UseVisualStyleBackColor = true;
+            this.chkEnable.UseVisualStyleBackColor = false;
             // 
             // radAuto
             // 
             this.radAuto.AutoSize = true;
-            this.radAuto.Location = new System.Drawing.Point(624, 187);
+            this.radAuto.Location = new System.Drawing.Point(625, 137);
             this.radAuto.Name = "radAuto";
-            this.radAuto.Size = new System.Drawing.Size(75, 16);
+            this.radAuto.Size = new System.Drawing.Size(98, 25);
             this.radAuto.TabIndex = 56;
             this.radAuto.TabStop = true;
             this.radAuto.Text = "자동 생성";
@@ -496,9 +462,9 @@
             // 
             this.radLogin.AutoSize = true;
             this.radLogin.Checked = true;
-            this.radLogin.Location = new System.Drawing.Point(507, 187);
+            this.radLogin.Location = new System.Drawing.Point(487, 137);
             this.radLogin.Name = "radLogin";
-            this.radLogin.Size = new System.Drawing.Size(99, 16);
+            this.radLogin.Size = new System.Drawing.Size(130, 25);
             this.radLogin.TabIndex = 56;
             this.radLogin.TabStop = true;
             this.radLogin.Text = "로그인시 생성";
@@ -509,33 +475,58 @@
             this.tbTag.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.tbTag.Location = new System.Drawing.Point(0, 638);
             this.tbTag.Name = "tbTag";
-            this.tbTag.Size = new System.Drawing.Size(850, 21);
+            this.tbTag.Size = new System.Drawing.Size(831, 21);
             this.tbTag.TabIndex = 60;
             this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // label7
+            // groupBox1
             // 
-            label7.AutoSize = true;
+            this.groupBox1.Controls.Add(this.tbProject);
-            label7.Location = new System.Drawing.Point(40, 149);
+            this.groupBox1.Controls.Add(projectLabel);
-            label7.Name = "label7";
+            this.groupBox1.Controls.Add(label7);
-            label7.Size = new System.Drawing.Size(29, 12);
+            this.groupBox1.Controls.Add(this.tbProjectIndex);
-            label7.TabIndex = 62;
+            this.groupBox1.Controls.Add(this.radLogin);
-            label7.Text = "분류";
+            this.groupBox1.Controls.Add(this.radAuto);
+            this.groupBox1.Controls.Add(this.cmbjobgrp);
+            this.groupBox1.Controls.Add(this.cmbjobproc);
+            this.groupBox1.Controls.Add(label3);
+            this.groupBox1.Controls.Add(label1);
+            this.groupBox1.Controls.Add(this.cmbRequest);
+            this.groupBox1.Controls.Add(this.cmbPackage);
+            this.groupBox1.Controls.Add(label6);
+            this.groupBox1.Controls.Add(typeLabel);
+            this.groupBox1.Controls.Add(this.cmbjobtype);
+            this.groupBox1.Location = new System.Drawing.Point(17, 191);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(802, 171);
+            this.groupBox1.TabIndex = 65;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "업무일지 등록 양식";
             // 
-            // cmbjobgrp
+            // groupBox2
             // 
-            this.cmbjobgrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.groupBox2.Controls.Add(this.dts);
-            this.cmbjobgrp.FormattingEnabled = true;
+            this.groupBox2.Controls.Add(stateLabel);
-            this.cmbjobgrp.Location = new System.Drawing.Point(72, 145);
+            this.groupBox2.Controls.Add(this.cmbGrp26);
-            this.cmbjobgrp.Name = "cmbjobgrp";
+            this.groupBox2.Controls.Add(this.checkBox1);
-            this.cmbjobgrp.Size = new System.Drawing.Size(241, 20);
+            this.groupBox2.Controls.Add(label5);
-            this.cmbjobgrp.TabIndex = 63;
+            this.groupBox2.Controls.Add(this.cmbUser);
+            this.groupBox2.Controls.Add(label4);
+            this.groupBox2.Controls.Add(this.dte);
+            this.groupBox2.Controls.Add(this.tbWeekE);
+            this.groupBox2.Controls.Add(this.tbWW);
+            this.groupBox2.Location = new System.Drawing.Point(17, 78);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(802, 107);
+            this.groupBox2.TabIndex = 66;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "근무 형태 설정";
             // 
             // fJobReport_AddAI
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(850, 681);
+            this.ClientSize = new System.Drawing.Size(831, 681);
             this.Controls.Add(this.richTextBoxEx1);
             this.Controls.Add(this.tbTag);
             this.Controls.Add(this.panel1);
@@ -543,7 +534,7 @@
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "fJobReport_AddAI";
-            this.Text = "업무일지 자동 입력 양식";
+            this.Text = "기타 근무 등록";
             this.Load += new System.EventHandler(this.fJobReport_Add_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
@@ -551,6 +542,10 @@
             this.statusStrip1.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -562,7 +557,6 @@
         private System.Windows.Forms.BindingSource bs;
         private dsPRJTableAdapters.JobReportTableAdapter ta;
         private dsPRJTableAdapters.TableAdapterManager tam;
-        private System.Windows.Forms.TextBox tbHrs;
         private System.Windows.Forms.StatusStrip statusStrip1;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
         private System.Windows.Forms.ToolStripStatusLabel lbIndex;
@@ -571,10 +565,9 @@
         private System.Windows.Forms.DateTimePicker dts;
         private System.Windows.Forms.ComboBox cmbUser;
         private System.Windows.Forms.TextBox tbProjectIndex;
-        private System.Windows.Forms.TextBox tbOt;
         private System.Windows.Forms.TextBox tbWW;
         private System.Windows.Forms.ComboBox cmbjobproc;
-        private System.Windows.Forms.ComboBox cmbState;
+        private System.Windows.Forms.ComboBox cmbGrp26;
         private System.Windows.Forms.ComboBox cmbPackage;
         private System.Windows.Forms.ComboBox cmbRequest;
         private System.Windows.Forms.ComboBox tbProject;
@@ -588,5 +581,9 @@
         private System.Windows.Forms.TextBox tbWeekE;
         private System.Windows.Forms.CheckBox checkBox1;
         private System.Windows.Forms.ComboBox cmbjobgrp;
+        private System.Windows.Forms.CheckBox chkKunmu;
+        private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.GroupBox groupBox2;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs

@@ -63,6 +63,7 @@ namespace FPJ0000.JobReport_
         private void fJobReport_Add_Load(object sender, EventArgs e)
         {
             EnsureVisibleAndUsableSize();
+
             //사용자목록
             this.bs.DataSource = dr;
 
@@ -74,10 +75,10 @@ namespace FPJ0000.JobReport_
 
             //상태
             var stateList = FCOMMON.DBM.getCodeTable("12");
-            this.cmbState.DisplayMember = "Value";
+            this.cmbGrp26.DisplayMember = "Value";
-            this.cmbState.ValueMember = "Value";
+            this.cmbGrp26.ValueMember = "Value";
-            this.cmbState.DataSource = stateList;
+            this.cmbGrp26.DataSource = stateList;
-            this.cmbState.Text = dr.status;
+            this.cmbGrp26.Text = dr.status;
 
             //요청부서
             var dt_request = FCOMMON.DBM.getCodeTable("13");
@@ -103,6 +104,12 @@ namespace FPJ0000.JobReport_
             this.cmbjobproc.ValueMember = "Value";
             this.cmbjobproc.DataSource = dt_process;
 
+            //근무형태
+            var dt_kunmu = FCOMMON.DBM.getCodeTable("26");
+            this.cmbGrp26.DisplayMember = "Value";
+            this.cmbGrp26.ValueMember = "Value";
+            this.cmbGrp26.DataSource = dt_kunmu;
+
             if (dr.autoinput == "L") radLogin.Checked = true;
             else radAuto.Checked = true;
 
@@ -182,18 +189,6 @@ namespace FPJ0000.JobReport_
             }
             tbProject.Tag = tbProject.Text;
 
-            //  if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
-
-            //editor
-            // ed = new editform.editor();
-            //ed.AllowDiscAccess = true;
-            //ed.WindowTitle = "Quick Edit";
-            //ed.StartingFont = new Font("Courier New", 12.0f, FontStyle.Regular);
-
-            //ed.DisplayEditForm(this.panel1);
-            //ed.AllowRtf = true;
-
-
 
             bInit = true;
         }
@@ -210,13 +205,6 @@ namespace FPJ0000.JobReport_
 
                 switch (nm)
                 {
-                    //case "cmbrequest":
-
-                    //    //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다.
-                    //    var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc");
-                    //    if (lastprocess != "") cbProcess.Text = lastprocess;
-                    //    tbSID.Focus();
-                    //    break;
                     case "tbdescription":
                         if (e.Control)
                         {
@@ -232,8 +220,7 @@ namespace FPJ0000.JobReport_
                                 this.tbProject.Text = f.Title;
                                 this.tbProject.Tag = f.Title;
                                 this.tbProjectIndex.Text = f.Index.ToString();
-                                tbHrs.Focus();
+                             
-                                tbHrs.SelectAll();
 
                                 if (tbProjectIndex.Tag.ToString() != f.Index.ToString() || f.Index == -1)
                                 {
@@ -306,14 +293,7 @@ namespace FPJ0000.JobReport_
                 this.richTextBoxEx1.Focus();
                 return;
             }
-            float hour = Single.Parse(tbHrs.Text) + Single.Parse(tbOt.Text);
+            float hour = 8f;
-            if (hour == 0)
-            {
-                FCOMMON.Util.MsgE("근무시간/초과시간이 입력되지 않았습니다.");
-                if (tbHrs.Enabled) tbHrs.Focus();
-                else tbOt.Focus();
-                return;
-            }
 
             if (cmbjobtype.Text.Trim() == "")
             {
@@ -343,24 +323,6 @@ namespace FPJ0000.JobReport_
                 tbProjectIndex.Text = "-1";
             }
 
-
-
-            double hrs2 = 0.0;
-            if (double.TryParse(tbHrs.Text, out hrs2) == false)
-            {
-                FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요");
-                tbHrs.Focus();
-                tbHrs.SelectAll();
-                return;
-            }
-
-            //if(hrs2 > 8)
-            //{
-            //    FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요");
-            //    tbHrs.SelectAll();
-            //    tbHrs.Focus();
-            //    return;
-            //}
             if (radAuto.Checked) dr.autoinput = "A"; //항상자동
             else dr.autoinput = "L"; //로그인자동
 
@@ -368,7 +330,7 @@ namespace FPJ0000.JobReport_
 
             this.dr.uid = this.cmbUser.SelectedValue.ToString();
             this.dr.pdate = dts.Value.ToShortDateString();
-            this.dr.status = cmbState.Text;
+            this.dr.status = cmbGrp26.Text;
             this.dr.projectName = tbProject.Text;
             if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
             else dr.SetpidxNull();
@@ -378,34 +340,13 @@ namespace FPJ0000.JobReport_
             this.dr.process = cmbjobproc.Text;
             this.dr.jobgrp = cmbjobgrp.Text;
             this.dr.tag = tbTag.Text.Trim();
-            if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
+            this.dr.hrs = 8f;
-            else this.dr.hrs = 0;
+            this.dr.SetotNull();
 
             //완료일자 적용 - 210803 chi  <= 김윤선p
             if (checkBox1.Checked) dr.edate = dte.Value.ToShortDateString();
             else dr.SetedateNull();
 
-            //ot 시간을 초기화한다. -- 210728 김윤선
-            if (double.TryParse(tbOt.Text, out double ot))
-            {
-                if (ot == 0.0)
-                {
-                    this.dr.SetotNull();
-                }
-                else
-                {
-                    this.dr.ot = ot;
-                }
-            }
-            else
-            {
-                this.dr.SetotNull();
-            }
-
-            if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text);
-            else this.dr.ot = 0;
-            //this.dr.description = richTextBox1.Text.Trim();
-
             //MessageBox.Show(richTextBox1.Text);
             this.dr.description = richTextBoxEx1.Text;
             this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;//  richTextBox1.Rtf;
@@ -442,26 +383,8 @@ namespace FPJ0000.JobReport_
             var dat = myCal.GetWeekOfYear(dts.Value, myCWR, myFirstDOW);
             tbWW.Text = "ww" + dat.ToString();
 
-            //공휴일이면 시간을 초기화한다.
-            if (tbHrs.Text == "") tbHrs.Text = "0";
-            if (tbOt.Text == "") tbOt.Text = "0";
-            float hrs = float.Parse(tbHrs.Text);
         }
 
-        private void cmbUser_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void tbOt_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void panel1_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
    
         private void dte_ValueChanged(object sender, EventArgs e)
         {

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="hrsLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="typeLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -144,7 +141,7 @@
   <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -165,7 +162,10 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>226, 17</value>
   </metadata>
-  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>False</value>
+    <value>416, 17</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>416, 17</value>
   </metadata>
 </root>

SubProject/FPJ0000/dsJobReport.xsd

@@ -394,6 +394,112 @@ WHERE  pdate = @pdate</CommandText>
               </DbSource>
             </Sources>
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="EETGW_JobReport_ExtTableAdapter" GeneratorDataComponentClassName="EETGW_JobReport_ExtTableAdapter" Name="EETGW_JobReport_Ext" UserDataComponentName="EETGW_JobReport_ExtTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_JobReport_Ext" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [EETGW_JobReport_Ext] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_reason = 1 AND [reason] IS NULL) OR ([reason] = @Original_reason)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" 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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_div" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_reason" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO [EETGW_JobReport_Ext] ([gcode], [uid], [div], [sdate], [edate], [reason], [remark], [wuid], [wdate]) VALUES (@gcode, @uid, @div, @sdate, @edate, @reason, @remark, @wuid, @wdate);
+SELECT idx, gcode, uid, div, sdate, edate, reason, remark, wuid, wdate FROM EETGW_JobReport_Ext WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  idx, gcode, uid, div, sdate, edate, reason, remark, wuid, wdate
+FROM     EETGW_JobReport_Ext
+WHERE  (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed)
+ORDER BY sdate DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_JobReport_Ext" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.EETGW_JobReport_Ext" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.EETGW_JobReport_Ext" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [EETGW_JobReport_Ext] SET [gcode] = @gcode, [uid] = @uid, [div] = @div, [sdate] = @sdate, [edate] = @edate, [reason] = @reason, [remark] = @remark, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_reason = 1 AND [reason] IS NULL) OR ([reason] = @Original_reason)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
+SELECT idx, gcode, uid, div, sdate, edate, reason, remark, wuid, wdate FROM EETGW_JobReport_Ext WHERE (idx = @idx) ORDER BY sdate DESC</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" 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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_div" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_reason" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_reason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reason" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_JobReport_Ext" 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>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
+              <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="div" DataSetColumn="div" />
+              <Mapping SourceColumn="sdate" DataSetColumn="sdate" />
+              <Mapping SourceColumn="edate" DataSetColumn="edate" />
+              <Mapping SourceColumn="reason" DataSetColumn="reason" />
+              <Mapping SourceColumn="remark" DataSetColumn="remark" />
+              <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
+              <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources>
           <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="ExistUserData" MethodsParameterType="CLR" Modifier="Public" Name="ExistUserData" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="ExistUserData">
@@ -416,13 +522,13 @@ and uid = @uid</CommandText>
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="dsJobReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dsJobReport" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsJobReport">
+  <xs:element name="dsJobReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsJobReport" msprop:Generator_UserDSName="dsJobReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="HolidayDateList" msprop:Generator_RowEvHandlerName="HolidayDateListRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayDateListRowDeleted" msprop:Generator_RowDeletingName="HolidayDateListRowDeleting" msprop:Generator_RowEvArgName="HolidayDateListRowChangeEvent" msprop:Generator_TablePropName="HolidayDateList" msprop:Generator_RowChangedName="HolidayDateListRowChanged" msprop:Generator_UserTableName="HolidayDateList" msprop:Generator_RowChangingName="HolidayDateListRowChanging" msprop:Generator_RowClassName="HolidayDateListRow" msprop:Generator_TableClassName="HolidayDateListDataTable" msprop:Generator_TableVarName="tableHolidayDateList">
+        <xs:element name="HolidayDateList" msprop:Generator_UserTableName="HolidayDateList" msprop:Generator_RowEvArgName="HolidayDateListRowChangeEvent" msprop:Generator_TableVarName="tableHolidayDateList" msprop:Generator_TablePropName="HolidayDateList" msprop:Generator_RowDeletingName="HolidayDateListRowDeleting" msprop:Generator_RowChangingName="HolidayDateListRowChanging" msprop:Generator_RowDeletedName="HolidayDateListRowDeleted" msprop:Generator_RowEvHandlerName="HolidayDateListRowChangeEventHandler" msprop:Generator_TableClassName="HolidayDateListDataTable" msprop:Generator_RowChangedName="HolidayDateListRowChanged" msprop:Generator_RowClassName="HolidayDateListRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
+              <xs:element name="pdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -432,135 +538,135 @@ and uid = @uid</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser">
+        <xs:element name="vJobReportForUser" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowClassName="vJobReportForUserRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
-              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
+              <xs:element name="pdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
+              <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="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnVarNameInTable="columnid" minOccurs="0">
+              <xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
+              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="process" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_UserColumnName="process" msprop:Generator_ColumnVarNameInTable="columnprocess" minOccurs="0">
+              <xs:element name="process" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_ColumnVarNameInTable="columnprocess" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:Generator_UserColumnName="process" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="type" msprop:Generator_ColumnPropNameInTable="typeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="type" msprop:Generator_UserColumnName="type" msprop:Generator_ColumnVarNameInTable="columntype" minOccurs="0">
+              <xs:element name="type" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="type" msprop:Generator_ColumnVarNameInTable="columntype" msprop:Generator_ColumnPropNameInTable="typeColumn" msprop:Generator_UserColumnName="type" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="svalue" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="svalueColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue" msprop:Generator_UserColumnName="svalue" msprop:Generator_ColumnVarNameInTable="columnsvalue" minOccurs="0">
+              <xs:element name="svalue" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue" msprop:Generator_ColumnVarNameInTable="columnsvalue" msprop:Generator_ColumnPropNameInTable="svalueColumn" msprop:Generator_UserColumnName="svalue" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="255" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_UserColumnName="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" type="xs:double" minOccurs="0" />
+              <xs:element name="hrs" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
-              <xs:element name="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_UserColumnName="ot" msprop:Generator_ColumnVarNameInTable="columnot" type="xs:double" minOccurs="0" />
+              <xs:element name="ot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
-              <xs:element name="requestpart" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="requestpartColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="requestpart" msprop:Generator_UserColumnName="requestpart" msprop:Generator_ColumnVarNameInTable="columnrequestpart" minOccurs="0">
+              <xs:element name="requestpart" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="requestpart" msprop:Generator_ColumnVarNameInTable="columnrequestpart" msprop:Generator_ColumnPropNameInTable="requestpartColumn" msprop:Generator_UserColumnName="requestpart" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="package" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="packageColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="package" msprop:Generator_UserColumnName="package" msprop:Generator_ColumnVarNameInTable="columnpackage" minOccurs="0">
+              <xs:element name="package" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="package" msprop:Generator_ColumnVarNameInTable="columnpackage" msprop:Generator_ColumnPropNameInTable="packageColumn" msprop:Generator_UserColumnName="package" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="userProcess" msprop:Generator_ColumnPropNameInTable="userProcessColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="userProcess" msprop:Generator_UserColumnName="userProcess" msprop:Generator_ColumnVarNameInTable="columnuserProcess" minOccurs="0">
+              <xs:element name="userProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="userProcess" msprop:Generator_ColumnVarNameInTable="columnuserProcess" msprop:Generator_ColumnPropNameInTable="userProcessColumn" msprop:Generator_UserColumnName="userProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="status" msprop:Generator_ColumnPropNameInTable="statusColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="status" msprop:Generator_UserColumnName="status" msprop:Generator_ColumnVarNameInTable="columnstatus" minOccurs="0">
+              <xs:element name="status" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="status" msprop:Generator_ColumnVarNameInTable="columnstatus" msprop:Generator_ColumnPropNameInTable="statusColumn" msprop:Generator_UserColumnName="status" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="projectName" msprop:Generator_ColumnPropNameInTable="projectNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="projectName" msprop:Generator_UserColumnName="projectName" msprop:Generator_ColumnVarNameInTable="columnprojectName" minOccurs="0">
+              <xs:element name="projectName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="projectName" msprop:Generator_ColumnVarNameInTable="columnprojectName" msprop:Generator_ColumnPropNameInTable="projectNameColumn" msprop:Generator_UserColumnName="projectName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="255" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" minOccurs="0">
+              <xs:element name="description" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" msprop:Generator_UserColumnName="description" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ww" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnVarNameInTable="columnww" minOccurs="0">
+              <xs:element name="ww" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_UserColumnName="ww" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="6" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_UserColumnName="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_UserColumnName="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="ot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_UserColumnName="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" type="xs:double" minOccurs="0" />
+              <xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
-              <xs:element name="otReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_UserColumnName="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" minOccurs="0">
+              <xs:element name="otReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:Generator_UserColumnName="otReason" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="255" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="grade" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grade" msprop:Generator_UserColumnName="grade" msprop:Generator_ColumnVarNameInTable="columngrade" minOccurs="0">
+              <xs:element name="grade" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grade" msprop:Generator_ColumnVarNameInTable="columngrade" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:Generator_UserColumnName="grade" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="indate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_UserColumnName="indate" msprop:Generator_ColumnVarNameInTable="columnindate" minOccurs="0">
+              <xs:element name="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="outdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_UserColumnName="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" minOccurs="0">
+              <xs:element name="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -570,56 +676,56 @@ and uid = @uid</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Common" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_TablePropName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_UserTableName="Common" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowClassName="CommonRow" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon">
+        <xs:element name="Common" msprop:Generator_UserTableName="Common" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_TableVarName="tableCommon" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_RowChangedName="CommonRowChanged" 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_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <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_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
+              <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="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_UserColumnName="grp" msprop:Generator_ColumnVarNameInTable="columngrp" minOccurs="0">
+              <xs:element name="grp" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_ColumnVarNameInTable="columngrp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_UserColumnName="grp" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_UserColumnName="code" msprop:Generator_ColumnVarNameInTable="columncode" minOccurs="0">
+              <xs:element name="code" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_UserColumnName="code" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="svalue" msprop:Generator_ColumnPropNameInTable="svalueColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue" msprop:Generator_UserColumnName="svalue" msprop:Generator_ColumnVarNameInTable="columnsvalue" minOccurs="0">
+              <xs:element name="svalue" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue" msprop:Generator_ColumnVarNameInTable="columnsvalue" msprop:Generator_ColumnPropNameInTable="svalueColumn" msprop:Generator_UserColumnName="svalue" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ivalue" msprop:Generator_ColumnPropNameInTable="ivalueColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ivalue" msprop:Generator_UserColumnName="ivalue" msprop:Generator_ColumnVarNameInTable="columnivalue" type="xs:int" minOccurs="0" />
+              <xs:element name="ivalue" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ivalue" msprop:Generator_ColumnVarNameInTable="columnivalue" msprop:Generator_ColumnPropNameInTable="ivalueColumn" msprop:Generator_UserColumnName="ivalue" type="xs:int" minOccurs="0" />
-              <xs:element name="fvalue" msprop:Generator_ColumnPropNameInTable="fvalueColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="fvalue" msprop:Generator_UserColumnName="fvalue" msprop:Generator_ColumnVarNameInTable="columnfvalue" type="xs:double" minOccurs="0" />
+              <xs:element name="fvalue" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="fvalue" msprop:Generator_ColumnVarNameInTable="columnfvalue" msprop:Generator_ColumnPropNameInTable="fvalueColumn" msprop:Generator_UserColumnName="fvalue" type="xs:double" minOccurs="0" />
-              <xs:element name="memo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_UserColumnName="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" minOccurs="0">
+              <xs:element name="memo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
+              <xs:element name="wuid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
-              <xs:element name="svalue2" msprop:Generator_ColumnPropNameInTable="svalue2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue2" msprop:Generator_UserColumnName="svalue2" msprop:Generator_ColumnVarNameInTable="columnsvalue2" minOccurs="0">
+              <xs:element name="svalue2" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue2" msprop:Generator_ColumnVarNameInTable="columnsvalue2" msprop:Generator_ColumnPropNameInTable="svalue2Column" msprop:Generator_UserColumnName="svalue2" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="1000" />
@@ -629,33 +735,97 @@ and uid = @uid</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_UserTableName="HolidayLIst">
+        <xs:element name="HolidayLIst" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" 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_TableClassName="HolidayLIstDataTable" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowClassName="HolidayLIstRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <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="pdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="free" msprop:Generator_ColumnPropNameInRow="free" msprop:Generator_ColumnPropNameInTable="freeColumn" msprop:Generator_ColumnVarNameInTable="columnfree" msprop:Generator_UserColumnName="free" type="xs:boolean" minOccurs="0" />
+              <xs:element name="free" msprop:Generator_ColumnVarNameInTable="columnfree" msprop:Generator_ColumnPropNameInRow="free" msprop:Generator_ColumnPropNameInTable="freeColumn" msprop:Generator_UserColumnName="free" type="xs:boolean" minOccurs="0" />
-              <xs:element name="memo" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_UserColumnName="memo" minOccurs="0">
+              <xs:element name="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="255" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="EETGW_JobReport_Ext" msprop:Generator_TableClassName="EETGW_JobReport_ExtDataTable" msprop:Generator_RowEvArgName="EETGW_JobReport_ExtRowChangeEvent" msprop:Generator_TableVarName="tableEETGW_JobReport_Ext" msprop:Generator_TablePropName="EETGW_JobReport_Ext" msprop:Generator_RowDeletingName="EETGW_JobReport_ExtRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_ExtRowChanging" msprop:Generator_RowDeletedName="EETGW_JobReport_ExtRowDeleted" msprop:Generator_RowEvHandlerName="EETGW_JobReport_ExtRowChangeEventHandler" msprop:Generator_RowChangedName="EETGW_JobReport_ExtRowChanged" msprop:Generator_UserTableName="EETGW_JobReport_Ext" msprop:Generator_RowClassName="EETGW_JobReport_ExtRow">
+          <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: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="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="div" msprop:Generator_ColumnVarNameInTable="columndiv" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_UserColumnName="div" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_UserColumnName="sdate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="edate" msprop:Generator_ColumnVarNameInTable="columnedate" msprop:Generator_ColumnPropNameInRow="edate" msprop:Generator_ColumnPropNameInTable="edateColumn" msprop:Generator_UserColumnName="edate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="reason" msprop:Generator_ColumnVarNameInTable="columnreason" msprop:Generator_ColumnPropNameInRow="reason" msprop:Generator_ColumnPropNameInTable="reasonColumn" msprop:Generator_UserColumnName="reason" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="remark" msprop:Generator_ColumnVarNameInTable="columnremark" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:Generator_UserColumnName="remark" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -677,5 +847,9 @@ and uid = @uid</CommandText>
       <xs:selector xpath=".//mstns:HolidayLIst" />
       <xs:field xpath="mstns:idx" />
     </xs:unique>
+    <xs:unique name="EETGW_JobReport_Ext_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:EETGW_JobReport_Ext" />
+      <xs:field xpath="mstns:idx" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FPJ0000/dsJobReport.xss

@@ -4,13 +4,14 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="13" ViewPortY="45" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="125" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:HolidayDateList" ZOrder="3" X="39" Y="135" Height="96" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:HolidayDateList" ZOrder="4" X="39" Y="135" Height="96" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="13" Y="321" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="5" X="13" Y="321" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Common" ZOrder="5" X="266" Y="226" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:Common" ZOrder="6" X="266" Y="226" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:HolidayLIst" ZOrder="2" X="287" Y="599" Height="210" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:HolidayLIst" ZOrder="3" X="287" Y="599" Height="210" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="109" Y="749" Height="48" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
+    <Shape ID="DesignTable:EETGW_JobReport_Ext" ZOrder="1" X="613" Y="235" Height="267" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="2" X="109" Y="749" Height="48" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/dsPRJ.xsd

@@ -2365,7 +2365,7 @@ WHERE  (gcode = @gcode) AND (wuid = @wuid) AND (import = 1) AND (CONVERT(CHAR(10
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_JobReport_AutoInput" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [EETGW_JobReport_AutoInput] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_JobReport_AutoInput] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)) AND ((@IsNull_kunmu = 1 AND [kunmu] IS NULL) OR ([kunmu] = @Original_kunmu)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" 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" />
@@ -2407,13 +2407,15 @@ WHERE  (gcode = @gcode) AND (wuid = @wuid) AND (import = 1) AND (CONVERT(CHAR(10
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kunmu" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_kunmu" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate], [jobgrp]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate, @jobgrp);
+                    <CommandText>INSERT INTO [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate], [jobgrp], [kunmu]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate, @jobgrp, @kunmu);
-SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())</CommandText>
+SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp, kunmu FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2438,13 +2440,14 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@kunmu" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, 
-               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp
+               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp, kunmu
 FROM     EETGW_JobReport_AutoInput
 WHERE  (gcode = @gcode)</CommandText>
                     <Parameters>
@@ -2454,8 +2457,8 @@ WHERE  (gcode = @gcode)</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_JobReport_AutoInput] SET [gcode] = @gcode, [pdate] = @pdate, [pidx] = @pidx, [projectName] = @projectName, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [process] = @process, [description] = @description, [remark] = @remark, [hrs] = @hrs, [ot] = @ot, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [description2] = @description2, [tag] = @tag, [autoinput] = @autoinput, [enable] = @enable, [edate] = @edate, [jobgrp] = @jobgrp WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)));
+                    <CommandText>UPDATE [EETGW_JobReport_AutoInput] SET [gcode] = @gcode, [pdate] = @pdate, [pidx] = @pidx, [projectName] = @projectName, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [process] = @process, [description] = @description, [remark] = @remark, [hrs] = @hrs, [ot] = @ot, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [description2] = @description2, [tag] = @tag, [autoinput] = @autoinput, [enable] = @enable, [edate] = @edate, [jobgrp] = @jobgrp, [kunmu] = @kunmu WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)) AND ((@IsNull_kunmu = 1 AND [kunmu] IS NULL) OR ([kunmu] = @Original_kunmu)));
-SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = @idx)</CommandText>
+SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp, kunmu FROM EETGW_JobReport_AutoInput WHERE (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2480,6 +2483,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@kunmu" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" 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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -2520,6 +2524,8 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kunmu" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_kunmu" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="kunmu" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_JobReport_AutoInput" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -2553,6 +2559,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
               <Mapping SourceColumn="ww" DataSetColumn="ww" />
               <Mapping SourceColumn="edate" DataSetColumn="edate" />
               <Mapping SourceColumn="jobgrp" DataSetColumn="jobgrp" />
+              <Mapping SourceColumn="kunmu" DataSetColumn="kunmu" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -5388,6 +5395,7 @@ WHERE  (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt)
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="kunmu" msprop:Generator_ColumnVarNameInTable="columnkunmu" msprop:Generator_ColumnPropNameInRow="kunmu" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="kunmuColumn" msprop:Generator_UserColumnName="kunmu" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/dsPRJ.xss

@@ -4,31 +4,31 @@
      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="386" ViewPortY="482" 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="702" ViewPortY="420" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Projects" ZOrder="1" X="386" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Projects" ZOrder="3" X="386" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="18" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:ProjectsMailList" ZOrder="24" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:ProjectsPart" ZOrder="12" X="973" Y="68" Height="381" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:ProjectsPart" ZOrder="13" X="973" Y="68" Height="381" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
     <Shape ID="DesignTable:ProjectsHistory" ZOrder="23" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:SPMaster" ZOrder="19" X="365" Y="305" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_Note" ZOrder="21" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_SaveCost" ZOrder="5" X="75" Y="490" Height="324" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_SaveCost" ZOrder="7" X="75" Y="490" Height="324" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ProjectPartStatus" ZOrder="13" X="1081" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ProjectPartStatus" ZOrder="14" X="1081" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_ProjecthistoryD" ZOrder="20" X="680" Y="203" Height="248" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="16" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="17" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="15" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="16" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="8" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="1" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="4" X="1574" Y="32" Height="324" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="6" X="1574" Y="32" Height="324" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjectReson" ZOrder="17" X="1561" Y="590" Height="267" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:EETGW_ProjectReson" ZOrder="2" X="1561" Y="590" Height="267" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:vJobReportForUserList" ZOrder="14" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:vJobReportForUserList" ZOrder="15" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:JobReport" ZOrder="2" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:JobReport" ZOrder="4" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEETGW_Project_LayoutList" ZOrder="11" X="1257" Y="353" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
+    <Shape ID="DesignTable:vEETGW_Project_LayoutList" ZOrder="12" X="1257" Y="353" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
-    <Shape ID="DesignTable:EETGW_Project_Layout" ZOrder="10" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
+    <Shape ID="DesignTable:EETGW_Project_Layout" ZOrder="11" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
-    <Shape ID="DesignTable:EETGW_DocuForm" ZOrder="7" X="358" Y="649" Height="229" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:EETGW_DocuForm" ZOrder="9" X="358" Y="649" Height="229" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:Auth" ZOrder="6" X="1552" Y="450" Height="324" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Auth" ZOrder="8" X="1552" Y="450" Height="324" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjectsSchedule_NoList" ZOrder="3" X="1362" Y="121" Height="96" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:EETGW_ProjectsSchedule_NoList" ZOrder="5" X="1362" Y="121" Height="96" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:SCTable" ZOrder="9" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:SCTable" ZOrder="10" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="22" X="2138" Y="50" Height="105" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
   </Shapes>
   <Connectors />