....

Project/Dialog/fLogin.cs

@@ -111,46 +111,65 @@ namespace Project.Dialog
 			Pub.setting.Save();
 
 			var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim());
-            var ta = new dsMSSQLTableAdapters.UsersTableAdapter();
+			var id = tbID.Text.Trim();
+			//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
 			try
 			{
-                var users = ta.GetIDPW(encpass, tbID.Text.Trim());
+				var userGcode=FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{id}','{encpass}')");
-                if (users.Rows.Count != 1)
+				//var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
+				if (String.IsNullOrEmpty(userGcode))
 				{
-                    users = ta.GetByNamePw(tbID.Text.Trim(), encpass);
+					Util.MsgE("입력한 사용자 계정이 존재하지 않습니다\n관리자에 문의 하세요");
-                    if (users.Rows.Count != 1)
-                    {
-                        Util.MsgE("입력한 사용자 계정이 존재하지 않습니다");
 					tbPW.SelectAll();
 					tbPW.Focus();
 					return;
 				}
+				else if (userGcode.StartsWith("@ERR"))
+				{
+					Util.MsgE("접속실패\n\n" + userGcode.Substring(3));
+					return;
 				}
 
 				//이사용자의 부서 코드확인
-                var userdr = users.Rows[0] as dsMSSQL.UsersRow;
+				var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
-                var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
+				var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
-                var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0;
-                if (userdr.level < 9 && Exist == false)
-                {
-                    Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
-                    return;
-                }
 
-                if (userdr.outdate.isEmpty() == false)
+				//var userdr = users.Rows[0] as dsMSSQL.UsersRow;
+				//var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
+				//var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0;
+				//if (userdr.level < 9 && Exist == false)
+				//{
+				//	Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
+				//	return;
+				//}
+
+				//if (userdr.outdate.isEmpty() == false)
+				//{
+				//	if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
+				//	{
+				//		if (DateTime.Now > dtout)
+				//		{
+				//			Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
+				//			return;
+				//		}
+				//	}
+				//	else
+				//	{
+				//		Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
+				//		return;
+				//	}
+				//}
+
+
+				var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
+				if (MaxVerstion.isEmpty() == false)
 				{
-                    if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
+					var curversion = Application.ProductVersion;
+					var verchk = curversion.CompareTo(MaxVerstion);
+					if (verchk < 0)
 					{
-                        if (DateTime.Now > dtout)
+						//내버젼이 낮다
-                        {
+						Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
-                            Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
-                        return;
 					}
 				}
 
@@ -167,7 +186,7 @@ namespace Project.Dialog
 				//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
 				var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
 				FCOMMON.info.Login.gcode = gCode;// gcode;
-                FCOMMON.info.Login.process = userdr.processs;
+				FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자": userdr.processs;
 				FCOMMON.info.Login.permission = 0;
 				FCOMMON.info.Login.gpermission = int.Parse(gperm);
 				FCOMMON.info.datapath = Pub.setting.SharedDataPath;
@@ -176,12 +195,12 @@ namespace Project.Dialog
 				if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
 					FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
 
-                using (var dbEnity = new EEEntitiesMain())
+				//using (var dbEnity = new EEEntitiesMain())
-                {
+				//{
-                    var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
+				//	var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
-                    if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : "");
+				//	if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : "");
-                    else FCOMMON.info.Login.process = drGrpUser.Process;
+				//	else FCOMMON.info.Login.process = drGrpUser.Process;
-                }
+				//}
 
 				//로그인정보 기록
 				AddLoginInfo();
@@ -221,7 +240,7 @@ namespace Project.Dialog
 			if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
 
 
-            var rows = 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 = 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));
 			foreach (var dr in rows)
 			{
 				//퇴사자 확인

Project/Properties/AssemblyInfo.cs

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

Project/dsMSSQL.Designer.cs

@@ -4164,6 +4164,8 @@ namespace Project {
             
             private global::System.Data.DataColumn columnuseUserState;
             
+            private global::System.Data.DataColumn columnpassword;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public vGroupUserDataTable() {
@@ -4365,6 +4367,14 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn passwordColumn {
+                get {
+                    return this.columnpassword;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -4423,7 +4433,8 @@ namespace Project {
                         string id, 
                         string state, 
                         bool useJobReport, 
-                        bool useUserState) {
+                        bool useUserState, 
+                        string password) {
                 vGroupUserRow rowvGroupUserRow = ((vGroupUserRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         gcode,
@@ -4446,7 +4457,8 @@ namespace Project {
                         id,
                         state,
                         useJobReport,
-                        useUserState};
+                        useUserState,
+                        password};
                 rowvGroupUserRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowvGroupUserRow);
                 return rowvGroupUserRow;
@@ -4498,6 +4510,7 @@ namespace Project {
                 this.columnstate = base.Columns["state"];
                 this.columnuseJobReport = base.Columns["useJobReport"];
                 this.columnuseUserState = base.Columns["useUserState"];
+                this.columnpassword = base.Columns["password"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4545,6 +4558,8 @@ namespace Project {
                 base.Columns.Add(this.columnuseJobReport);
                 this.columnuseUserState = new global::System.Data.DataColumn("useUserState", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnuseUserState);
+                this.columnpassword = new global::System.Data.DataColumn("password", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnpassword);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columngcode,
                                 this.columnid}, true));
@@ -4569,6 +4584,7 @@ namespace Project {
                 this.columnid.AllowDBNull = false;
                 this.columnid.MaxLength = 20;
                 this.columnstate.MaxLength = 20;
+                this.columnpassword.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8199,6 +8215,22 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string password {
+                get {
+                    if (this.IspasswordNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tablevGroupUser.passwordColumn]));
+                    }
+                }
+                set {
+                    this[this.tablevGroupUser.passwordColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsdeptNull() {
@@ -8426,6 +8458,18 @@ namespace Project {
             public void SetuseUserStateNull() {
                 this[this.tablevGroupUser.useUserStateColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IspasswordNull() {
+                return this.IsNull(this.tablevGroupUser.passwordColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetpasswordNull() {
+                this[this.tablevGroupUser.passwordColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -15510,6 +15554,7 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR
             tableMapping.ColumnMappings.Add("state", "state");
             tableMapping.ColumnMappings.Add("useJobReport", "useJobReport");
             tableMapping.ColumnMappings.Add("useUserState", "useUserState");
+            tableMapping.ColumnMappings.Add("password", "password");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -15536,16 +15581,22 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = @"SELECT  gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState
+            this._commandCollection[0].CommandText = @"SELECT  gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password
 FROM     vGroupUser
 WHERE  (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs)
 ORDER BY name";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@processs", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[1].Connection = this.Connection;
+            this._commandCollection[1].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15596,6 +15647,54 @@ ORDER BY name";
             return dataTable;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
+        public virtual int FillByID(dsMSSQL.vGroupUserDataTable dataTable, string gcode, string id) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((id == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(id));
+            }
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual dsMSSQL.vGroupUserDataTable GetByID(string gcode, string id) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((id == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(id));
+            }
+            dsMSSQL.vGroupUserDataTable dataTable = new dsMSSQL.vGroupUserDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
@@ -16732,7 +16831,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.IDbCommand[2];
+            this._commandCollection = new global::System.Data.IDbCommand[3];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::Project.Properties.Settings.Default.gwcs);
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "SELECT  ISNULL(name, \'\') AS itemName\r\nFROM     Items\r\nWHERE  (idx = @id)";
@@ -16743,6 +16842,13 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "SELECT  ISNULL(name, \'\') AS ProjectName\r\nFROM     Projects\r\nWHERE  (idx = @idx)";
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.Text;
             ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::Project.Properties.Settings.Default.gwcs);
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "dbo.GetUserLoginCheck";
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandType = global::System.Data.CommandType.StoredProcedure;
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.ReturnValue, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pw", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16802,6 +16908,46 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                 return ((string)(returnValue));
             }
         }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual object GetUserLoginCheck(string id, string pw) {
+            global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2]));
+            if ((id == null)) {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[1].Value = ((string)(id));
+            }
+            if ((pw == null)) {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[2].Value = ((string)(pw));
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            object returnValue;
+            try {
+                returnValue = command.ExecuteScalar();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            if (((returnValue == null) 
+                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+                return null;
+            }
+            else {
+                return ((object)(returnValue));
+            }
+        }
     }
     
     /// <summary>

Project/dsMSSQL.xsd

@@ -1066,7 +1066,7 @@ and uid = @uid</CommandText>
                 </DeleteCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState
+                    <CommandText>SELECT  gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id, state, useJobReport, useUserState, password
 FROM     vGroupUser
 WHERE  (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs)
 ORDER BY name</CommandText>
@@ -1113,8 +1113,21 @@ WHERE  (gcode = @gcode) AND (uid = @id)</CommandText>
               <Mapping SourceColumn="state" DataSetColumn="state" />
               <Mapping SourceColumn="useJobReport" DataSetColumn="useJobReport" />
               <Mapping SourceColumn="useUserState" DataSetColumn="useUserState" />
+              <Mapping SourceColumn="password" DataSetColumn="password" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vGroupUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByID" GeneratorSourceName="FillByID" GetMethodModifier="Public" GetMethodName="GetByID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByID" UserSourceName="FillByID">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT ads_created, ads_employNo, ads_title, dept, email, gcode, grade, hp, id, indate, level, memo, name, nameE, outdate, password, place, processs, state, tel, useJobReport, useUserState FROM vGroupUser WHERE (gcode = @gcode) AND (id = @id) ORDER BY name</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vGroupUser" 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="id" ColumnName="id" DataSourceName="EE.dbo.vGroupUser" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportTableAdapter" GeneratorDataComponentClassName="JobReportTableAdapter" Name="JobReport" UserDataComponentName="JobReportTableAdapter">
             <MainSource>
@@ -1316,6 +1329,18 @@ WHERE  (idx = @idx)</CommandText>
               </DbCommand>
             </SelectCommand>
           </DbSource>
+          <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.GetUserLoginCheck" DbObjectType="Function" GenerateShortCommands="true" GeneratorSourceName="GetUserLoginCheck" MethodsParameterType="CLR" Modifier="Public" Name="GetUserLoginCheck" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="GetUserLoginCheck">
+            <SelectCommand>
+              <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                <CommandText>dbo.GetUserLoginCheck</CommandText>
+                <Parameters>
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@pw" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumnNullMapping="false" SourceVersion="Current" />
+                </Parameters>
+              </DbCommand>
+            </SelectCommand>
+          </DbSource>
         </Sources>
       </DataSource>
     </xs:appinfo>
@@ -1323,7 +1348,7 @@ WHERE  (idx = @idx)</CommandText>
   <xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
+        <xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -1464,7 +1489,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
+        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="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" />
@@ -1535,7 +1560,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
+        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1593,7 +1618,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowEvArgName="InventoryRowChangeEvent">
+        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_RowClassName="InventoryRow">
           <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" />
@@ -1663,7 +1688,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_RowClassName="LineCodeRow" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent">
+        <xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent" msprop:Generator_RowClassName="LineCodeRow">
           <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" />
@@ -1721,7 +1746,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_RowClassName="UserGroupRow" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent">
+        <xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_RowClassName="UserGroupRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
@@ -1750,7 +1775,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent">
+        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -1866,7 +1891,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_GroupUser" msprop:Generator_TableClassName="EETGW_GroupUserDataTable" msprop:Generator_TableVarName="tableEETGW_GroupUser" msprop:Generator_RowChangedName="EETGW_GroupUserRowChanged" msprop:Generator_TablePropName="EETGW_GroupUser" msprop:Generator_RowDeletingName="EETGW_GroupUserRowDeleting" msprop:Generator_RowChangingName="EETGW_GroupUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_GroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_GroupUserRowDeleted" msprop:Generator_RowClassName="EETGW_GroupUserRow" msprop:Generator_UserTableName="EETGW_GroupUser" msprop:Generator_RowEvArgName="EETGW_GroupUserRowChangeEvent">
+        <xs:element name="EETGW_GroupUser" msprop:Generator_TableClassName="EETGW_GroupUserDataTable" msprop:Generator_TableVarName="tableEETGW_GroupUser" msprop:Generator_TablePropName="EETGW_GroupUser" msprop:Generator_RowDeletingName="EETGW_GroupUserRowDeleting" msprop:Generator_RowChangingName="EETGW_GroupUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_GroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_GroupUserRowDeleted" msprop:Generator_UserTableName="EETGW_GroupUser" msprop:Generator_RowChangedName="EETGW_GroupUserRowChanged" msprop:Generator_RowEvArgName="EETGW_GroupUserRowChangeEvent" msprop:Generator_RowClassName="EETGW_GroupUserRow">
           <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" />
@@ -1905,7 +1930,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent" msprop:Generator_RowClassName="vGroupUserRow">
+        <xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_RowClassName="vGroupUserRow" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -2037,10 +2062,17 @@ WHERE  (idx = @idx)</CommandText>
               </xs:element>
               <xs:element name="useJobReport" msprop:Generator_ColumnVarNameInTable="columnuseJobReport" msprop:Generator_ColumnPropNameInRow="useJobReport" msprop:Generator_ColumnPropNameInTable="useJobReportColumn" msprop:Generator_UserColumnName="useJobReport" type="xs:boolean" minOccurs="0" />
               <xs:element name="useUserState" msprop:Generator_ColumnVarNameInTable="columnuseUserState" msprop:Generator_ColumnPropNameInRow="useUserState" msprop:Generator_ColumnPropNameInTable="useUserStateColumn" msprop:Generator_UserColumnName="useUserState" type="xs:boolean" minOccurs="0" />
+              <xs:element name="password" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="password" msprop:Generator_ColumnVarNameInTable="columnpassword" msprop:Generator_ColumnPropNameInTable="passwordColumn" msprop:Generator_UserColumnName="password" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow">
+        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent">
           <xs: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" />

Project/dsMSSQL.xss

@@ -4,19 +4,19 @@
      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="2" ViewPortY="-21" 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="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Users" ZOrder="3" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
+    <Shape ID="DesignTable:Users" ZOrder="4" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
     <Shape ID="DesignTable:Projects" ZOrder="11" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
     <Shape ID="DesignTable:Items" ZOrder="7" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:Inventory" ZOrder="10" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
-    <Shape ID="DesignTable:LineCode" ZOrder="4" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
+    <Shape ID="DesignTable:LineCode" ZOrder="5" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
     <Shape ID="DesignTable:UserGroup" ZOrder="8" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
-    <Shape ID="DesignTable:SPMaster" ZOrder="2" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SPMaster" ZOrder="3" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_GroupUser" ZOrder="5" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:EETGW_GroupUser" ZOrder="6" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vGroupUser" ZOrder="6" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vGroupUser" ZOrder="1" X="938" Y="-5" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="9" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:JobReport" ZOrder="2" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:JobReport" ZOrder="1" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="9" X="673" Y="48" Height="220" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

Project/fMain.Designer.cs

@@ -124,6 +124,7 @@
 			this.toolStripMenuItem5 = 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();
 			this.tabControl1 = new System.Windows.Forms.TabControl();
 			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
 			this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
@@ -210,7 +211,8 @@
             this.기타ToolStripMenuItem,
             this.즐겨찾기ToolStripMenuItem,
             this.btDev,
-            this.설명서ToolStripMenuItem});
+            this.설명서ToolStripMenuItem,
+            this.버젼확인ToolStripMenuItem});
 			this.menuStrip1.Location = new System.Drawing.Point(1, 1);
 			this.menuStrip1.Name = "menuStrip1";
 			this.menuStrip1.Size = new System.Drawing.Size(1094, 27);
@@ -907,6 +909,14 @@
 			this.설명서ToolStripMenuItem.Text = "설명서";
 			this.설명서ToolStripMenuItem.Click += new System.EventHandler(this.설명서ToolStripMenuItem_Click);
 			// 
+			// 버젼확인ToolStripMenuItem
+			// 
+			this.버젼확인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("버젼확인ToolStripMenuItem.Image")));
+			this.버젼확인ToolStripMenuItem.Name = "버젼확인ToolStripMenuItem";
+			this.버젼확인ToolStripMenuItem.Size = new System.Drawing.Size(93, 23);
+			this.버젼확인ToolStripMenuItem.Text = "버젼확인";
+			this.버젼확인ToolStripMenuItem.Click += new System.EventHandler(this.버젼확인ToolStripMenuItem_Click);
+			// 
 			// tabControl1
 			// 
 			this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -917,7 +927,7 @@
 			this.tabControl1.Name = "tabControl1";
 			this.tabControl1.SelectedIndex = 0;
 			this.tabControl1.ShowToolTips = true;
-            this.tabControl1.Size = new System.Drawing.Size(1062, 594);
+			this.tabControl1.Size = new System.Drawing.Size(1065, 594);
 			this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
 			this.tabControl1.TabIndex = 34;
 			this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -933,9 +943,9 @@
             this.toolStripMenuItem6,
             this.toolStripButton1,
             this.toolStripButton2});
-            this.toolStrip1.Location = new System.Drawing.Point(1063, 28);
+			this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
 			this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(32, 594);
+			this.toolStrip1.Size = new System.Drawing.Size(29, 594);
 			this.toolStrip1.TabIndex = 35;
 			this.toolStrip1.Text = "toolStrip1";
 			// 
@@ -944,7 +954,7 @@
 			this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
 			this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
 			this.toolStripMenuItem8.Name = "toolStripMenuItem8";
-            this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20);
+			this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
 			this.toolStripMenuItem8.Text = "업무일지";
 			this.toolStripMenuItem8.ToolTipText = "업무일지";
 			this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -954,7 +964,7 @@
 			this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
 			this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
 			this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20);
+			this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
 			this.toolStripMenuItem7.Text = "구매신청";
 			this.toolStripMenuItem7.ToolTipText = "구매신청";
 			this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -964,7 +974,7 @@
 			this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
 			this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
 			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20);
+			this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
 			this.toolStripMenuItem6.Text = "프로젝트";
 			this.toolStripMenuItem6.ToolTipText = "프로젝트";
 			this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -975,7 +985,7 @@
 			this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
 			this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(29, 20);
+			this.toolStripButton1.Size = new System.Drawing.Size(26, 20);
 			this.toolStripButton1.Text = "구매진행상황";
 			this.toolStripButton1.ToolTipText = "구매진행상황";
 			this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
@@ -986,7 +996,7 @@
 			this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
 			this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.toolStripButton2.Name = "toolStripButton2";
-            this.toolStripButton2.Size = new System.Drawing.Size(29, 20);
+			this.toolStripButton2.Size = new System.Drawing.Size(26, 20);
 			this.toolStripButton2.Text = "품목정보";
 			this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
 			// 
@@ -1123,6 +1133,7 @@
         private System.Windows.Forms.ToolStripMenuItem 휴가사용현황ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 개인별근태원장ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 근태입력오류확인ToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem 버젼확인ToolStripMenuItem;
 	}
 }
 

Project/fMain.cs

@@ -1096,5 +1096,26 @@ namespace Project
             var f = new FBS0000.Holiday.fErrorChk();
             f.Show();
         }
+
+		private void 버젼확인ToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+            var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
+            if (MaxVerstion.isEmpty() == false)
+            {
+                var curversion = Application.ProductVersion;
+                var verchk = curversion.CompareTo(MaxVerstion);
+                if (verchk < 0)
+                {
+                    //내버젼이 낮다
+                    Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
+				}
+				else
+				{
+                    Util.MsgI("최신 버젼을 사용하고 있습니다\n\n" +
+                        "서버 : " + MaxVerstion + "\n" + 
+                       "현재 : " + curversion);
+				}
+            }
+        }
 	}
 }

Project/fMain.resx

@@ -355,6 +355,16 @@
         oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
         IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
         D4UNMwz8ISAAOw==
+</value>
+  </data>
+  <data name="버젼확인ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c
+        hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg
+        USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP
+        GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE
+        DQ8eBAjwYKZhhQQPFoRMuXJAADs=
 </value>
   </data>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FBS0000/Holiday/WorkTable.cs

@@ -147,7 +147,10 @@ namespace FBS0000
                 fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
                 fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
 
+                if (item.empno == "77607")
+                {
 
+                }
                 //이월잔액
                 var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999");
                 var used = 0.0;
@@ -162,6 +165,7 @@ namespace FBS0000
                     var ps = (int[])fpSpread1_Sheet1.Columns[c].Tag;
 
 
+
                     var curDate = sd.AddDays(c - 4);
                     var bholy = false;
                     //이날짜가 휴일인지 체크한다.
@@ -217,7 +221,7 @@ namespace FBS0000
                     ps[2] += 1;
 
                     //근태기록에 자료가 있는지 확인한다.
-                    var dr = dtHoly.Where(t => t.uid == item.empno && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
+                    var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
                     if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null)  //휴일이 아니여야 한다
                     {
 

SubProject/FBS0000/Holiday/fHolyday.Designer.cs

@@ -32,6 +32,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
             FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
             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();
@@ -74,10 +75,13 @@
             this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
             this.dsMSSQL = new FBS0000.dsMSSQL();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
             this.dtSD = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
             this.dtED = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripButton9 = new System.Windows.Forms.ToolStripButton();
             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
             this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
@@ -96,9 +100,6 @@
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
             this.textBox1 = new System.Windows.Forms.TextBox();
-            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton9 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -187,7 +188,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -373,6 +373,16 @@
             this.toolStrip1.Text = "toolStrip1";
             this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked);
             // 
+            // toolStripButton8
+            // 
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
+            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton8.Name = "toolStripButton8";
+            this.toolStripButton8.Size = new System.Drawing.Size(28, 28);
+            this.toolStripButton8.Text = "toolStripButton7";
+            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
+            // 
             // lbStt
             // 
             this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
@@ -385,7 +395,6 @@
             // dtSD
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtSD.Name = "dtSD";
             this.dtSD.Size = new System.Drawing.Size(100, 31);
             this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -397,15 +406,33 @@
             this.toolStripLabel2.Size = new System.Drawing.Size(15, 28);
             this.toolStripLabel2.Text = "~";
             // 
+            // toolStripLabel4
+            // 
+            this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
+            this.toolStripLabel4.Name = "toolStripLabel4";
+            this.toolStripLabel4.Size = new System.Drawing.Size(43, 28);
+            this.toolStripLabel4.Text = "종료일";
+            this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
+            // 
             // dtED
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtED.Name = "dtED";
             this.dtED.Size = new System.Drawing.Size(100, 31);
             this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.dtED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown);
             // 
+            // toolStripButton9
+            // 
+            this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image")));
+            this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton9.Name = "toolStripButton9";
+            this.toolStripButton9.Size = new System.Drawing.Size(28, 28);
+            this.toolStripButton9.Text = "toolStripButton7";
+            this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click);
+            // 
             // toolStripLabel3
             // 
             this.toolStripLabel3.Name = "toolStripLabel3";
@@ -557,62 +584,34 @@
             this.textBox1.TabIndex = 5;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
-            // toolStripButton8
-            // 
-            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
-            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton8.Name = "toolStripButton8";
-            this.toolStripButton8.Size = new System.Drawing.Size(28, 28);
-            this.toolStripButton8.Text = "toolStripButton7";
-            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
-            // 
-            // toolStripButton9
-            // 
-            this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image")));
-            this.toolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton9.Name = "toolStripButton9";
-            this.toolStripButton9.Size = new System.Drawing.Size(28, 28);
-            this.toolStripButton9.Text = "toolStripButton7";
-            this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click);
-            // 
-            // toolStripLabel4
-            // 
-            this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
-            this.toolStripLabel4.Name = "toolStripLabel4";
-            this.toolStripLabel4.Size = new System.Drawing.Size(43, 28);
-            this.toolStripLabel4.Text = "종료일";
-            this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
-            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
             this.fpSpread1_Sheet1.SheetName = "WorkTable";
             // 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.ColumnCount = 18;
             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, 2).Value = "종료일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "사번";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "성명";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사번";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사용(일)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "성명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "사용(H)";
+            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, 7).Value = "사용(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).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, 9).Value = "#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "발생(H)";
+            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, 11).Value = "발생(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "잔량(H)";
+            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, 13).Value = "잔량(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)";
+            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, 15).Value = "전일(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "등록";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "소스";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "등록";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
             this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate";
@@ -622,137 +621,146 @@
             dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
             dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2022, 2, 3, 16, 27, 10, 432);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469);
             this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일";
             this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
+            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType2.TimeDefault = new System.DateTime(2022, 3, 14, 8, 30, 41, 469);
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일";
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "종료일";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(3).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid";
             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).Label = "요일";
-            this.fpSpread1_Sheet1.Columns.Get(3).Tag = "empno";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            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 = textCellType3;
-            textCellType4.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "uid";
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명";
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "사번";
-            this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name";
+            this.fpSpread1_Sheet1.Columns.Get(4).Tag = "empno";
             this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            textCellType4.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            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).Tag = "name";
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
             numberCellType1.MaximumValue = 999999999999999D;
             numberCellType1.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term";
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "term";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)";
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(일)";
-            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr";
+            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "dr";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
             numberCellType2.MaximumValue = 999999999999999D;
             numberCellType2.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime";
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "CrTime";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "사용(H)";
-            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh";
+            this.fpSpread1_Sheet1.Columns.Get(7).Tag = "drh";
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents";
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "contents";
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용";
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "내용";
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag";
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "tag";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "#";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "#";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F;
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 40F;
-            this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             numberCellType3.MaximumValue = 999999999999999D;
             numberCellType3.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr";
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "termDr";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)";
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(일)";
-            this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr";
+            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "cr";
-            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             numberCellType4.MaximumValue = 999999999999999D;
             numberCellType4.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime";
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "DrTime";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)";
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "발생(H)";
-            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh";
+            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "crh";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             numberCellType5.DecimalPlaces = 1;
             numberCellType5.MaximumValue = 999999999999999D;
             numberCellType5.MinimumValue = -999999999999999D;
             numberCellType5.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]";
+            this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)";
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(일)";
-            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand";
+            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "jand";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             numberCellType6.DecimalPlaces = 2;
             numberCellType6.MaximumValue = 999999999999999D;
             numberCellType6.MinimumValue = -999999999999999D;
             numberCellType6.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]";
+            this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[2]+RC[-2]-RC[-6]";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)";
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "잔량(H)";
-            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh";
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "janh";
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
             numberCellType7.DecimalPlaces = 1;
             numberCellType7.MaximumValue = 999999999999999D;
             numberCellType7.MinimumValue = -999999999999999D;
             numberCellType7.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray;
+            this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray;
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)";
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(일)";
-            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand";
+            this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjand";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
             numberCellType8.DecimalPlaces = 2;
             numberCellType8.MaximumValue = 999999999999999D;
             numberCellType8.MinimumValue = -999999999999999D;
             numberCellType8.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray;
+            this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.Gray;
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)";
-            this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjanh";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "extcate";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "소스";
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "전일(H)";
-            this.fpSpread1_Sheet1.Columns.Get(15).Tag = "src";
+            this.fpSpread1_Sheet1.Columns.Get(15).Tag = "yjanh";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "wuid";
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "extcate";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "등록";
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "소스";
+            this.fpSpread1_Sheet1.Columns.Get(16).Tag = "src";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Width = 70F;
+            this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "wuid";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "등록";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Width = 70F;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
             this.fpSpread1_Sheet1.FrozenColumnCount = 1;

SubProject/FBS0000/Holiday/fHolyday.resx

@@ -212,23 +212,6 @@
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi
-        Dwoi+hDnpKuoiVlGI7sI6iKQqJxDzCVZmjKn7iPmNtsHTk+0D9bSo9tSl86lsJ3TzjbH03vO8thwF77w
-        4/Ae+D/v7zznnB38oiiqcvy5DGPNVTDVHgS5dXyb7OeHDzscDsbtsoNy2WC4UYH19fVtIYQolcqdWq32
-        pvFpAxyqBhiuVyCVShXAsiwYhhFJJBLIZrP5gEIDK/RXpVsCNkI2SCaTyGQyhQb6Jw2wt8uhvyIFx3EC
-        D3oiaNZEcI/Q1B1GU1cYjQTeQgwQDZx5g5HLUqTTaQF+WGONoZvw1hJD11gMdzpDQgBvVWAw0irHl1f1
-        GL5ULqTz/H+qggzeVdO43UELHQQCgVxRg6EL5UJBfADHpWDzRtDvnEaXJYL39kWMUvNY+72M1dVVhgQc
-        3TRQ1mP8pQxD58v+DXPoNs9gmFrGzC8WoTiHidkEDN9WYHTPIR6PF+nAaYX2bKkQwHfw0RlFYCEJd/gP
-        nHMsHARflEPveBgejwcSieSEaKB7KIOtrQ6D1aViiZ3mMOgYB+csAzvNwBxMgvrJ4Z1tAUtLS1sNpojB
-        QNUBscRe8syBRRa26fwwz9Q8B9Xoj61fou5+HSwvajFwZjPA6oligk7gKxlyhVOYJKfrPEm0a4YwT+mL
-        G/SfLkEulxPexMoaC9f3GPpIFx8cUahNIbzWjMJnUGNSJUdTzb4WwUChUJT0VB/C4LVj6DtVApqmEQwG
-        4ff74fV6hcJ8Pp9wtX16g4mOW5gztmGwtTJFLPKrtmzXyUdH9jyuk+6WkW2xX1eksWZvy2flRc707Bz+
-        Auv5x/1fRd3rAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqqsoU2cXEUQU3QUFoSjR
@@ -243,6 +226,23 @@
         bNB3uhjZbFZ4E8urLJzfY+glXXywR6AaCeK1WgefQYXxNhkaqvc1CQYKhaK4u+oQBq4dQ++pYtA0jUAg
         AL/fD6/XKxTm8/mEq+XTG7jab2HO2IKB5ooUscitmtJdJx8d2fO4VrJbSraFfl2R+uq9TZ+VF7mRZ+fw
         F+UJx/ryG7vdAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
+        Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF
+        H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
+        NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4
+        gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur
+        WvRdKhfSef7fVU0G7+po3G6lhQ4mJydzRQ1MF8qFgvgAjsvA4Y+gxzONdlsE712LGKDmsfJ7CclkkiEB
+        RzcNNLVwvlTAdL7s3zCHjuEZ9FFLmPnFIpTgMDqbgvXbMgbH5pBIJIp04LHDeLZUCOA7+OiJYmohjbHw
+        H3jmWLgJgSiHLmcYPp8PJSUlJ0QD80MFHM1yGKpLxRLbhsOg4xw8swxcNIPhYBrUTw7vHAuIxWJbDSaI
+        QW/VAbHELvLOU4ssHNP5YZ6JeQ7agR9bv0TzfTlsL2ToPbMZYPdFMUqn8JUMecMZjJPdzb40WvQmzFOW
+        4gY9pyXI5XLCSSyvsPB+j6ObdPHBHYVuKITX+gEErDqMa5Wor9nXKBio1WpJZ/UhGK4dQ/cpCWiaRjAY
+        5M8afr9fKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv
+        3hnH99rC8mEAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -284,41 +284,41 @@
   <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB1aNkXcwDUaExPj
-        C/giaowRQSiibC0Uyg6CyqKSuEaEQvcCFSjgE2oCaiQYNWIUKLLK8U46TagP7b1Dgi89yX2+v8zMuf/J
+        F/BF1BgjglBE2VooLTsIKotK4hoRSncKrVCgPqEmoEaCUSNG2WSV4510mlAf6L1Dgi89yX2+v8zMuf/J
-        9XDHHXcE5OHx1xceHLNY7x/tR8MRsg73of5QH+oSelEb34t7By24e8CCO/vJ2teDmr09qI7rxu093aiK
+        9XDHHXcE5OHx1xceHLOO3z9qQ8MRsg73ov5QL+oSe1Cb0IN7B7tx90A37uwna58VNXutqI7vwu09XaiK
-        7ULl7i5U7HqF8hiyos0oizKjNNKMkohOFId3okjSAWUYWaHtKAxpR0GwyZofZEjkt3edZcZBEWRCbqBp
+        60Tl7k5U7HqF8liyYiwoi7agNMqCkkgzisVmFIk6oIwgK7wdirB2FIaaxgtCjEn89q6zzDjIQ0zICzaN
-        gt/edZYblx9oQl6AEfz2rvM/cHIxC3AJuLLoTigj9MiTtKFAokNReAcVTu5voAcu5ckVRmrR//gjZqfm
+        8du7znLjCoJNyA9qA7+96/wPnCyQBbgEXFmMGcpIA/JFahSK9CgSd1DhZAFGeuBSnpwiSgfb44+YmZxD
-        YWn8AHmIhgon28kAFIrjnlx75TssTnG8lgqXu0NPDxSCK4404dGlHiz8WeBpwM+RScjCVFS4HD8GICuu
+        d+MHyMK0VDjpTgagUBz35Nor32FhihN0VLi8HQZ6oBBccZQJjy5ZMf9nnqcBP4cmII1QUeFy/RmArLjS
-        NKoDVacMmJ6Y5WnA3Mw8as4aoQg2UuGyfXX0QDYcKUWsFt/fj/M0W15I+5EXrKPGZfkwAGlx3FGiCNfg
+        6A5UnTJiamyGpwGz03OoOdsGeWgbFS7HT08PZMORUsTp8P39KE+z54XEhvxQPTUu25cBSIvjjhK5WIu3
-        reYzz7Klu2GIHLxqJlymNwuQElcYroepwrEUw/2j5LtrZcZlemnpgTS4oghSiouOpRj78huFcWry3RmY
+        2s88y56uhgFy8GqYcFk+LEBKnEJsgKnCuRSDtmHy3bUy47K8dfRAGlxRJCnFRedSjHz5DUW8hnx3Rmbc
-        cbe2MwBd4Uoi+VJY53iarRTVZ4wgQ18Q7qanhh7oDMeNL0WYDkMdX3maLc9S+iAP0grGZWxjADrDcbM1
+        re0MQFe4kii+FOOzPM1eiuozbSBDXxDuppeWHrgYjhtf8gg9Bjq+8jR7nqX2QhaiE4zL3MYAXAzHzdaC
-        P1SHwXZH4NPkXsgCtYJxN0RqeqAzHDf4lRITyk/oHV/x9DwqTxOQWC8Il76VAegMZx/8ihA9GhO7HUry
+        cD36252BT1N6IA3WCcbd8NTQAxfDcYNfKTKh/ITB+RVPzaHyNAEFGgThMrYyABfDOQa/PMyAxqQup5L8
-        i5REHtMKmb+OGSfd0kYPdIWzz1ZZkAb60jc8z5ZPfaPIFDcz49I2swApcPZzLkuswkDbCM+zxVw7iAzf
+        IiWRxbZCGqBnxkm2qOmBrnCO2SoN0cJQ+obn2fOpdxhZgc3MuPTNLEAKnOOcyw5UoU89xPPssdT2I9Ov
-        FiZc2qZWeiAtjiuEPMCAHIkK34bGeJ4tT5IsyPBupcalbmQA0uLsbeW+OWWCBlPji34WSGlKTxKUl5oK
+        hQmXvqmVHkiL4wohCzIiV6TCt4ERnmfPk+RuZPq0UuPSNjIAaXGOtnLfnDJRi8nRBT8LpDSlJwnKW0OF
-        d30DA5AFZ29rlp8a9ec6HUrzY3gCUp8mKlzKehU9kBVnL0SGjwoa5QDPsyU7ooUKl7yOASgEZy+E1Psl
+        u76BAciCc7Q121+D+nNmp9L8GByDxLeJCpe6XkUPZMU5CpHpq4JW2cfz7MmJbKHCpaxjAArBOQoh8XmJ
-        usjfzMzkHMx1g0gVNVHhrq1toQcKxdkLIfVsQYroOcE1I13URoVLWsMCXAKOthD/4pJWN9MD/wfu6ioG
+        TvI3Mz0xC0tdP9I8m6hw19a20AOF4hyFkHi1INXzOcE1I8NTTYVLXsMCXAKOthD/4pJXN9MD/wfu6ioG
-        IMFZlxt3eWUT/dUHd5HD3ZUsJ+7Kiqbz/PbuuOMOfTw8/gIMiT37T9A/6AAAAABJRU5ErkJggg==
+        IMGNLzfu8som+qsP7iKHuytZTtyVFU3n+e3dcccd+nh4/AXhRz35FoyUPQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBwaUguAtuidHE
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji
-        B999cUuMCi4oYktpsbbFoogLgqJRMVHEbkOnrUApBZ40kqCQuCVqJJESWZTjDDONEpP23jGpLz3Jfb6/
+        g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6dFSmkBnySQIJAokoiRREpkUY4zzjRKTNp7xwRfepL7fH+Z
-        zJ0z380kxBNPPBJyd3vnodptwdCdrR24vYVbue2oyWlH9eYgbm0KompjG25uaMON9dxaF8D1tQFcW9OK
+        O2e+mwkKJJBAJOThwTdn6g+4PQ/2d+H+Pm6ldKIuuRO1eztwb08Hana7cXeXG3d2cmuHC7e3u3BrWzuq
-        yuxWXM3yo2K1H1cyW3A5g1vqZpSvaoZ1ZTMurWhC2fImWNKfw5zGrWU+mFJ9uJjiDV1IZg+K20dPjHEw
+        k9pxM9GJqq1O3Ehow/V4bqkcqIxzoCLWgWtbWlG+uRVlMa9RquTWphboo1tQEmX3XI1kT4vb+88c46CL
-        JnuhV3n7xe2jJ9a4CyovSpUeiNtHz//AGZJogIS4q9l+WDM9MKmdKFOzKM9olowzJLLkQNInV5bBouNB
+        tEOrsI+J2/vPXOOuKuwoltsgbu8//wNXFEEDJMTdTHKiIsEGvcqMchWLyniHZFxROEsOJH1y5fEsup4M
-        D4a//0BnXS/MqxjJOP1SCiDxse5g8Wd8Fa9gWu6WhCtZ4iYHkr5zliwGfe8HRB4w+nMU9w8HYEr3UON0
+        YOrbd7xpGERpHCMZVxhGASQ+1kMs/kxLVQ/0m62ScNpQKzmQ9J0rS2QwOjQu8oCZHzN4fNYFfYyNGlew
-        iymApIWwqptQtdc3dsThDIVGULGLhSnNS4UrVjSSA0lw4bZaVnrw+FSHyBPypbcfxkwHLqZ6iXFaOQWQ
+        kQJIWogKVStqjrf8OmJvJj3TqDrCQq+0U+HyQ5rJgSQ4b1vLYm14nt4l8oR8HhyDLsGEkmg7MS5PRgEk
-        FBcuhDGtEYHa1yJPSBf7ESXJdmKcRkYDpMCFC2FIt6Mn8FnkCXFbX0KndBHhNIsYciAtji+EKY1717Ic
+        xXkLoVM2w1X/TuQJ6WWHoY00EuM0wTRACpy3EEUxRgy4RkSeEGtFNwrkFiKcZgNDDqTF8YXQK7l3LdGE
-        6Hv3R2lGgXuH/ChOdEXFnV9IAaTFhdtqTPGgcg+LkcHfpRnsH4Yl14WSpY0RcUULXORAKbhwW/UqBo/y
+        0Q9/lGYGeHTGifxwi19c7noKIC3O21ZdlA3Vx1hMT/wuzcTYFMpSLNCGNfvEqddZyIFScN62FioYPEvr
-        gyJPSJfnI4oUtoi4c/MpgFJxfCFKlAzq8sYDX7k/cEB7RFzhPCc5UCrOoGRxZbf7ryM2bXZCq2Ai4s7O
+        EHlCem3DUIcYfOJy1lIApeL4QmjlDBpSZwN7rB85oNEnLnuNmRwoFVckZ3HjqPWvI9bvNSMvhPGJy1pN
-        pQBKwZWqPNCrbfj6NiTShJLU7m9BkdweFXdmjoMcSIvjv3MaZQPeBD6JNCGM+QXOyW1EuILZNEBKnDbR
+        AZSCK1bYUKgy4Mt7j0gTSlJ/sg1qmdEvLnOViRxIi+O/cxp5E/pdn0SaEKb0LXJkBiJcxkoaICUuL9yE
-        gZaabpEl5CXzHoWKp8S4gll2ciANTpfkwsNjbSJLyOc336BJbYBGzhDjTs+kAJLi9ElulO90j7ssDHKX
+        tro+kSWkmxlCdshLYlzGCiM5kAZXEGHB0wtukSVkpP8rNNFN0MgYYtyV5RRAUlxhhBWVh62zLgsT3GWh
-        BXOOkxp3agYFkATHjy+t6tn4UnDXrep9TSiSOahxJ6fbyIEkOH62GrMdIk0IX4pCmU0S7sQ0CiAJjp+t
+        NNlMjUtfRgEkwfHjK0/xanYpuOtW7YlWqINN1LjLSw3kQBIcP1t1SSaRJoQvRXawQRLu0hIKIAmOn625
-        5xfb0HqnG0MDI/Df7sZZ+VPJuPypz8iBJDh+8OuWNI5NiDOyJ//05Hhc3hQaIAEu2uCnxeVNbiAH/g/c
+        Gw1of9CHyfFpOO/3IUv2UjIubfErciAJjh/8BaHNvyZEZvCLf3pyPC51EQ2QAOdv8NPiUhc2kQP/B+7i
-        8UkUQA4XijXuyMR68l8f/I8c/l9JLHFHJ9QfELePJ554yJOQ8AvCuz6iy+fZHAAAAABJRU5ErkJggg==
+        Agogh/PMNe7c/EbyXx/8jxz+X8lc4s7Pazwlbh9IIIGQJyjoJ38CPp5C2VW3AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -389,6 +389,16 @@
         AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
         K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
         AAD/////AQgAAP////8AAQgAAAs=
+</value>
+  </data>
+  <data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
+        cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
+        cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
+        AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
+        K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
+        AAD/////AQgAAP////8AAQgAAAs=
 </value>
   </data>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs

@@ -36,6 +36,7 @@
             System.Windows.Forms.Label label3;
             System.Windows.Forms.Label label4;
             System.Windows.Forms.Label label5;
+            System.Windows.Forms.Label label6;
             this.dsMSSQL = new FBS0000.dsMSSQL();
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager();
@@ -48,6 +49,7 @@
             this.cmbType = new System.Windows.Forms.ComboBox();
             this.nudDrHour = new System.Windows.Forms.NumericUpDown();
             this.nudDrDay = new System.Windows.Forms.NumericUpDown();
+            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
             sdateLabel = new System.Windows.Forms.Label();
             contentsLabel = new System.Windows.Forms.Label();
             uidLabel = new System.Windows.Forms.Label();
@@ -56,6 +58,7 @@
             label3 = new System.Windows.Forms.Label();
             label4 = new System.Windows.Forms.Label();
             label5 = new System.Windows.Forms.Label();
+            label6 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudCrDAy)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudCrHour)).BeginInit();
@@ -66,21 +69,21 @@
             // sdateLabel
             // 
             sdateLabel.AutoSize = true;
-            sdateLabel.Location = new System.Drawing.Point(44, 49);
+            sdateLabel.Location = new System.Drawing.Point(30, 49);
             sdateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             sdateLabel.Name = "sdateLabel";
-            sdateLabel.Size = new System.Drawing.Size(37, 19);
+            sdateLabel.Size = new System.Drawing.Size(51, 19);
             sdateLabel.TabIndex = 2;
-            sdateLabel.Text = "기간";
+            sdateLabel.Text = "시작일";
             // 
             // contentsLabel
             // 
             contentsLabel.AutoSize = true;
-            contentsLabel.Location = new System.Drawing.Point(42, 113);
+            contentsLabel.Location = new System.Drawing.Point(44, 148);
             contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             contentsLabel.Name = "contentsLabel";
             contentsLabel.Size = new System.Drawing.Size(37, 19);
-            contentsLabel.TabIndex = 6;
+            contentsLabel.TabIndex = 8;
             contentsLabel.Text = "내용";
             // 
             // uidLabel
@@ -100,7 +103,7 @@
             label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label1.Name = "label1";
             label1.Size = new System.Drawing.Size(51, 19);
-            label1.TabIndex = 12;
+            label1.TabIndex = 14;
             label1.Text = "사용일";
             // 
             // label2
@@ -110,7 +113,7 @@
             label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(65, 19);
-            label2.TabIndex = 14;
+            label2.TabIndex = 16;
             label2.Text = "사용시간";
             // 
             // label3
@@ -120,7 +123,7 @@
             label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label3.Name = "label3";
             label3.Size = new System.Drawing.Size(65, 19);
-            label3.TabIndex = 10;
+            label3.TabIndex = 12;
             label3.Text = "발생시간";
             // 
             // label4
@@ -130,17 +133,17 @@
             label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label4.Name = "label4";
             label4.Size = new System.Drawing.Size(51, 19);
-            label4.TabIndex = 8;
+            label4.TabIndex = 10;
             label4.Text = "발생일";
             // 
             // label5
             // 
             label5.AutoSize = true;
-            label5.Location = new System.Drawing.Point(44, 81);
+            label5.Location = new System.Drawing.Point(44, 115);
             label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label5.Name = "label5";
             label5.Size = new System.Drawing.Size(37, 19);
-            label5.TabIndex = 4;
+            label5.TabIndex = 6;
             label5.Text = "구분";
             // 
             // dsMSSQL
@@ -164,13 +167,13 @@
             // 
             // contentsTextBox
             // 
-            this.contentsTextBox.Location = new System.Drawing.Point(87, 113);
+            this.contentsTextBox.Location = new System.Drawing.Point(87, 145);
             this.contentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.contentsTextBox.Multiline = true;
             this.contentsTextBox.Name = "contentsTextBox";
             this.contentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.contentsTextBox.Size = new System.Drawing.Size(460, 184);
+            this.contentsTextBox.Size = new System.Drawing.Size(460, 152);
-            this.contentsTextBox.TabIndex = 7;
+            this.contentsTextBox.TabIndex = 9;
             // 
             // dateTimePicker1
             // 
@@ -194,7 +197,7 @@
             this.btOK.Location = new System.Drawing.Point(87, 373);
             this.btOK.Name = "btOK";
             this.btOK.Size = new System.Drawing.Size(460, 38);
-            this.btOK.TabIndex = 16;
+            this.btOK.TabIndex = 18;
             this.btOK.Text = "OK";
             this.btOK.UseVisualStyleBackColor = true;
             this.btOK.Click += new System.EventHandler(this.btOK_Click);
@@ -210,7 +213,7 @@
             0});
             this.nudCrDAy.Name = "nudCrDAy";
             this.nudCrDAy.Size = new System.Drawing.Size(183, 27);
-            this.nudCrDAy.TabIndex = 13;
+            this.nudCrDAy.TabIndex = 15;
             this.nudCrDAy.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // nudCrHour
@@ -224,16 +227,16 @@
             0});
             this.nudCrHour.Name = "nudCrHour";
             this.nudCrHour.Size = new System.Drawing.Size(197, 27);
-            this.nudCrHour.TabIndex = 15;
+            this.nudCrHour.TabIndex = 17;
             this.nudCrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // cmbType
             // 
             this.cmbType.FormattingEnabled = true;
-            this.cmbType.Location = new System.Drawing.Point(87, 78);
+            this.cmbType.Location = new System.Drawing.Point(87, 112);
             this.cmbType.Name = "cmbType";
             this.cmbType.Size = new System.Drawing.Size(462, 27);
-            this.cmbType.TabIndex = 5;
+            this.cmbType.TabIndex = 7;
             // 
             // nudDrHour
             // 
@@ -246,7 +249,7 @@
             0});
             this.nudDrHour.Name = "nudDrHour";
             this.nudDrHour.Size = new System.Drawing.Size(197, 27);
-            this.nudDrHour.TabIndex = 11;
+            this.nudDrHour.TabIndex = 13;
             this.nudDrHour.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // nudDrDay
@@ -260,14 +263,33 @@
             0});
             this.nudDrDay.Name = "nudDrDay";
             this.nudDrDay.Size = new System.Drawing.Size(183, 27);
-            this.nudDrDay.TabIndex = 9;
+            this.nudDrDay.TabIndex = 11;
             this.nudDrDay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // dateTimePicker2
+            // 
+            this.dateTimePicker2.Location = new System.Drawing.Point(87, 78);
+            this.dateTimePicker2.Name = "dateTimePicker2";
+            this.dateTimePicker2.Size = new System.Drawing.Size(462, 27);
+            this.dateTimePicker2.TabIndex = 5;
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new System.Drawing.Point(30, 82);
+            label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label6.Name = "label6";
+            label6.Size = new System.Drawing.Size(51, 19);
+            label6.TabIndex = 4;
+            label6.Text = "종료일";
+            // 
             // fHolyday_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(566, 430);
+            this.Controls.Add(this.dateTimePicker2);
+            this.Controls.Add(label6);
             this.Controls.Add(this.contentsTextBox);
             this.Controls.Add(this.nudDrHour);
             this.Controls.Add(label3);
@@ -317,5 +339,6 @@
         private System.Windows.Forms.ComboBox cmbType;
         private System.Windows.Forms.NumericUpDown nudDrHour;
         private System.Windows.Forms.NumericUpDown nudDrDay;
+        private System.Windows.Forms.DateTimePicker dateTimePicker2;
     }
 }

SubProject/FBS0000/Holiday/fHolyday_Add.cs

@@ -60,7 +60,7 @@ namespace FBS0000
         {
             cmbUser.SelectedValue = dr.uid;// FCOMMON.info.Login.no;// .Text = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
             dateTimePicker1.Value = dr.sdate;
-            //dateTimePicker2.Value = dr.edate;
+            dateTimePicker2.Value = dr.edate;
 
             cmbType.Text = dr.cate;
             contentsTextBox.Text = dr.contents;
@@ -92,6 +92,15 @@ namespace FBS0000
                 return;
             }
 
+
+            var vs = dateTimePicker1.Value;
+            var ve = dateTimePicker2.Value;
+            if(ve < vs)
+            {
+                FCOMMON.Util.MsgE("종료일이 시작일보다 작습니다");
+                return;
+            }
+
             var usertxt = cmbUser.Text.Trim();
             var userid = usertxt.Substring(usertxt.IndexOf('(')+1, usertxt.LastIndexOf(')') - usertxt.IndexOf('(') -1);
 
@@ -103,8 +112,8 @@ namespace FBS0000
             dr.uid = userid;// cmbType.SelectedValue.ToString();
 
             dr.sdate = dateTimePicker1.Value;
-            dr.edate = dr.sdate;
+           // dr.edate = dr.sdate;
-           // dr.edate = dateTimePicker2.Value;
+            dr.edate = dateTimePicker2.Value;
 
             dr.cate = cmbType.Text;
             dr.contents = contentsTextBox.Text;

SubProject/FBS0000/Holiday/fHolyday_Add.resx

@@ -150,4 +150,7 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>248, 17</value>
   </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

SubProject/FCOMMON/DataBaseManager.cs

@@ -183,6 +183,21 @@ namespace FCOMMON
 			return bmp;
 		}
 
+		public static string GetMaxVersion()
+		{
+			try
+			{
+				var sql = "select max(prgmVersion) from ProgramUser" +
+				" where prgmName = 'Amkor K4-EET GroupWare'";
+				return ExecuteScalar(sql);
+			}
+			catch (Exception ex)
+			{
+				return string.Empty;
+			}
+		}
+
+
 		public static sItemInfo getLastPurchaseInfo(int idx)
 		{
 			var cn = getCn();
@@ -608,7 +623,7 @@ namespace FCOMMON
 				return da > 0;
 			}
 
-            catch {}
+			catch { }
 			return false;
 		}
 

SubProject/FEQ0000/Purchase/fPurchase.Designer.cs

@@ -30,34 +30,34 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -132,8 +132,8 @@
             this.btViewDel = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.label1 = new System.Windows.Forms.Label();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+            this.label1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -644,7 +644,8 @@
             this.cmbSort.Items.AddRange(new object[] {
             "등록일",
             "완료일",
-            "S/C"});
+            "S/C",
+            "SID+등록일"});
             this.cmbSort.Name = "cmbSort";
             this.cmbSort.Size = new System.Drawing.Size(90, 37);
             // 
@@ -784,18 +785,6 @@
             this.fpSpread1.TabIndex = 4;
             this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
             // 
-            // label1
-            // 
-            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.label1.Location = new System.Drawing.Point(0, 629);
-            this.label1.Name = "label1";
-            this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
-            this.label1.Size = new System.Drawing.Size(1226, 23);
-            this.label1.TabIndex = 6;
-            this.label1.Text = "--";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // fpSpread1_Sheet1
             // 
             this.fpSpread1_Sheet1.Reset();
@@ -839,7 +828,7 @@
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType39;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
@@ -848,7 +837,7 @@
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
             this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType40;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -856,27 +845,27 @@
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType41;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType42;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process";
             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(3).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType43;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청";
             this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName";
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType44;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
@@ -884,182 +873,182 @@
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType45;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF";
             this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType46;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
             this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName";
             this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType47;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
             this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid";
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType48;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명";
             this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname";
             this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
+            numberCellType17.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType17.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType17.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
+            numberCellType17.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType17;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType49;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
             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).Tag = "pumscale";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType50;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept";
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사";
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType50;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc";
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정";
             this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType50;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset";
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델";
             this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
-            numberCellType2.DecimalPlaces = 0;
+            numberCellType18.DecimalPlaces = 0;
-            numberCellType2.NegativeRed = true;
+            numberCellType18.NegativeRed = true;
-            numberCellType2.NullDisplay = "--";
+            numberCellType18.NullDisplay = "--";
-            numberCellType2.Separator = ",";
+            numberCellType18.Separator = ",";
-            numberCellType2.ShowSeparator = true;
+            numberCellType18.ShowSeparator = true;
-            numberCellType2.ShrinkToFit = true;
+            numberCellType18.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType18;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량";
             this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty";
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType51;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위";
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F;
-            numberCellType3.DecimalPlaces = 2;
+            numberCellType19.DecimalPlaces = 2;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가($)";
             this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 0;
+            numberCellType20.DecimalPlaces = 0;
-            numberCellType4.MaximumValue = 9999999999999.99D;
+            numberCellType20.MaximumValue = 9999999999999.99D;
-            numberCellType4.MinimumValue = -9999999999999.99D;
+            numberCellType20.MinimumValue = -9999999999999.99D;
-            numberCellType4.NegativeRed = true;
+            numberCellType20.NegativeRed = true;
-            numberCellType4.NullDisplay = "--";
+            numberCellType20.NullDisplay = "--";
-            numberCellType4.Separator = ",";
+            numberCellType20.Separator = ",";
-            numberCellType4.ShowSeparator = true;
+            numberCellType20.ShowSeparator = true;
-            numberCellType4.ShrinkToFit = true;
+            numberCellType20.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "단가";
             this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumprice";
             this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F;
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType21.DecimalPlaces = 0;
-            numberCellType5.MaximumValue = 9999999999999.99D;
+            numberCellType21.MaximumValue = 9999999999999.99D;
-            numberCellType5.MinimumValue = -9999999999999.99D;
+            numberCellType21.MinimumValue = -9999999999999.99D;
-            numberCellType5.NegativeRed = true;
+            numberCellType21.NegativeRed = true;
-            numberCellType5.NullDisplay = "--";
+            numberCellType21.NullDisplay = "--";
-            numberCellType5.Separator = ",";
+            numberCellType21.Separator = ",";
-            numberCellType5.ShowSeparator = true;
+            numberCellType21.ShowSeparator = true;
-            numberCellType5.ShrinkToFit = true;
+            numberCellType21.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType21;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액";
             this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt";
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType52;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체";
             this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply";
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType6.DecimalPlaces = 0;
+            numberCellType22.DecimalPlaces = 0;
-            numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType22.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType6.MaximumValue = 2147483647D;
+            numberCellType22.MaximumValue = 2147483647D;
-            numberCellType6.MinimumValue = -2147483648D;
+            numberCellType22.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType22;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(21).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType53;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project";
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "프로젝트";
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F;
             this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType7.DecimalPlaces = 0;
+            numberCellType23.DecimalPlaces = 0;
-            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType23.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType23.MaximumValue = 2147483647D;
-            numberCellType7.MinimumValue = -2147483648D;
+            numberCellType23.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType23;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Label = "*";
             this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx";
             this.fpSpread1_Sheet1.Columns.Get(23).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType54;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고";
             this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo";
             this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType55;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고예정";
             this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType56;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "indate";
             this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고일";
             this.fpSpread1_Sheet1.Columns.Get(26).Tag = "indate";
             this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F;
-            numberCellType8.NegativeRed = true;
+            numberCellType24.NegativeRed = true;
-            numberCellType8.ShowSeparator = true;
+            numberCellType24.ShowSeparator = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType24;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고수량";
             this.fpSpread1_Sheet1.Columns.Get(27).Tag = "inqty";
             this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType57;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "po";
             this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "PO#";
             this.fpSpread1_Sheet1.Columns.Get(28).Tag = "po";
             this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType3;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel";
             this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨";
             this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel";
@@ -1070,6 +1059,18 @@
             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
+            // label1
+            // 
+            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.label1.Location = new System.Drawing.Point(0, 629);
+            this.label1.Name = "label1";
+            this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
+            this.label1.Size = new System.Drawing.Size(1226, 23);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "--";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // fPurchase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

SubProject/FEQ0000/Purchase/fPurchase.cs

@@ -203,10 +203,25 @@ namespace FEQ0000
                 // else cmd.CommandText += " and (state < '04' or state > '07')";
 
 
-                if (cmbSort.SelectedIndex == 1) dateField = "edate";
+                if (cmbSort.SelectedIndex == 1)
-                else if (cmbSort.SelectedIndex == 2) dateField = "sc";
+                {
-
+                    dateField = "edate";
                     cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";
+                }
+                else if (cmbSort.SelectedIndex == 2)
+                {
+                    dateField = "sc";
+                    cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";
+                }
+                else if (cmbSort.SelectedIndex == 3)
+                {
+                    cmd.CommandText += " ORDER BY state , (case sid when '' then '0' when '신규' then '0' when '신규품목' then '0' else '1' end) desc, pdate desc, idx DESC";
+                }
+                else
+                {
+                    cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";
+                }
+                
 
                 cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text));
                 cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@ed", dtED.Text));

SubProject/FEQ0000/Purchase/fPurchase.resx

@@ -264,6 +264,20 @@
         pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L
         fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+
         brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
+        EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
+        7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
+        BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
+        Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
+        tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
+        iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
+        DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="입고품목메일전송ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -303,20 +317,6 @@
         oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A
         cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA
         Ow==
-</value>
-  </data>
-  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
-        EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
-        7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
-        BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
-        Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
-        tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
-        iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
-        DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
-        AAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -409,14 +409,14 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGTSURBVFhH7ZDLSsNAFIbzIq59BJ9Am6SlN/Al+hZFkKQX
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGRSURBVFhH7ZDdSgJBGIa9kY67hK6gdFXyB7oJr6IIYv1L
-        C+60Yqs7dSkobrzbmURXuihCpdilVGhRsFpxzBmSUsPYNJ3QiMwHP5OZ8zP9OpLg3xPREOGJmsNvqYJ5
+        6KyMrM6qw6DoRPp1xq2jOpDAkDwMA6Ugy2jyHXbFZHJdZ3Ej5oGX2ZnvZXwcn+Lf49cJk0kwRd9iGePE
-        FNEvZ+G+hSVzJl0yD+Gc1feTgSAP7Zd3Uqk1+3HN6M5n0VyscNGpomYfznkITNCBSubxE6z2EReBC8KL
+        n7ycxn1zy8ZUPGcc41zUd5KeoAyNl3dWKNU683q5NbtEZsKZi2aB1Do4l8E1QQsumaZPWM0jKVwXxIuF
-        RfOYrkEQuCAQ9F1CkIfQBDdPWyRRNEjlrGWfsAlNMLli0h6sowhNEF4O5Kp/9QXHRQiygPlwRgHzqQsC
+        0pSvbuC6IHD7LiUog2eCW6d1FsmWWeGsbp6I8UwwumrwHtZheCaIl4Pc9l99wVFRgiIw788wMJ+4ILDk
-        jpxXF+ZCkIUj59WFuRBk4ch5dWEuBFk4cl5dmAtBN47YcH4DZlMX9IMQ5EUI8iIEefkhyJvF1RuydvxI
+        7LqYK0ERlpxdF3MlKMKSs+tirgRFWHJ2XcyV4CCWWH9+A7OJCzpBCcqiBGVRgrL8EJTNwtoNWy8+8m+s
-        v2GFvbszSQaCB40vruze9Uhmq04vzWzXyZ61Z/X8ZCAYXTaeN3CXWfKTndsevRRkWXM/KVs+SuG8TQVl
+        2A92xklP8Kj6JZX9uzZL7FT4pYndCjvo7kU9J+kJhlbKz5u0JSw5yd5tm18KWdHcSfJdHy1z3uCCgSQJ
-        HakgCZdPGvcfhB9g9cYNyCkaUqggL3KulkqWrl7LuEP27z/JOuqQhLVXdJy0K+Gjaigdz10/yNmTj1gR
+        QhKXj5vBP4gfEPVGDeQ0nWhcUJZAqhSL5q5e87TJDu8/2QZpskh3ryVp1Kx4T1An8fnU9UNgsfgRztIq
-        N0DaHglCRpK+ARAkpJsozCLRAAAAAElFTkSuQmCC
+        pM2RwmN8vm/2naSYGr2SOAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -232,6 +232,23 @@ namespace FPJ0000.JobReport_
 			this.Show();
 			Application.DoEvents();
 
+
+
+			var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
+			if (string.IsNullOrEmpty(MaxVerstion) == false)
+			{
+				var curversion = Application.ProductVersion;
+				var verchk = curversion.CompareTo(MaxVerstion);
+				if (verchk < 0)
+				{
+					//내버젼이 낮다
+					FCOMMON.Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
+				}
+			}
+
+
+
+
 			if (dr.ot > 0 && dr.ot2 > 0)
 			{
 				tbOt.Enabled = false;
@@ -267,7 +284,7 @@ namespace FPJ0000.JobReport_
 			}
 
 			//신규데이터라면 양식을 처리한다.
-            if (copyMOde==false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
+			if (copyMOde == false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
 			{
 				//해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
 				var db = new EEEntities();
@@ -494,7 +511,6 @@ namespace FPJ0000.JobReport_
 					dr.otStart = dateTimePicker1.Value;
 					dr.otEnd = dateTimePicker2.Value;
 				}
-
 			}
 			else
 			{
@@ -503,7 +519,18 @@ namespace FPJ0000.JobReport_
 				dr.SetotEndNull();
 			}
 
-            //if(hrs2 > 8)
+			//var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
+			//if (string.IsNullOrEmpty(MaxVerstion) == false)
+			//{
+			//	var curversion = Application.ProductVersion;
+			//	var verchk = curversion.CompareTo(MaxVerstion);
+			//	if (verchk < 0)
+			//	{
+			//		//내버젼이 낮다
+			//		FCOMMON.Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
+			//	}
+			//}
+			////if(hrs2 > 8)
 			//{
 			//    FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요");
 			//    tbHrs.SelectAll();

SubProject/FPJ0000/JobReport_/rJobReportUser.cs

@@ -263,7 +263,7 @@ namespace FPJ0000.JobReport_
                 this.progressBar2.Value += 1;
                 var item = baseData.Where(t => t.process == prcitem.memo); //해당 프로세스에 해당하는 아이템을 가져온다
                                                                            //}
-
+                if (prcitem.memo == null) prcitem.memo = string.Empty;
                 if(prcitem.memo.StartsWith("ASM Feeder Center"))
                     Console.WriteLine("sdf");
 

SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs

@@ -14,37 +14,7 @@ namespace FPJ0000.OtConfirm
     {
         dsPRJ.JobReportRow[] dr;
         Boolean binit = false;
-        //public fOTConfirmOK(dsPRJ.JobReportRow dr_)
-        //{
-        //    InitializeComponent();
-        //    dr = dr_;
 
-        //    //var userlist = FCOMMON.DBM.getUserTable();
-        //    //this.cmbUser.DataSource = userlist;
-        //    //this.cmbUser.ValueMember = "id";
-        //    //this.cmbUser.DisplayMember = "dispname";
-
-        //    //textBox1.Text = dr.username;
-        //    //textBox2.Text = dr.pdate;
-        //    //textBox3.Text = dr.projectName;
-        //    //tbRemark.Text = dr.description;
-        //    //numericUpDown2.Value = (decimal)dr.ot;
-        //    //tbRemark.ImeMode = ImeMode.Hangul;
-
-
-
-        //    //var dt = DateTime.Parse(dr.pdate);
-        //    //textBox2.Text = dt.ToLongDateString();
-
-        //    //if(dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday)
-        //    //{
-        //    //    numericUpDown1.Value = (decimal)(dr.ot * 1.5f);
-        //    //}
-        //    //else
-        //    //{
-        //    //    numericUpDown1.Value = (decimal)dr.ot;
-        //    //}
-        //}
         public fOTConfirmOK(dsPRJ.JobReportRow[] dr_)
         {
             InitializeComponent();

SubProject/FPJ0000/Project/fProjectSchedule.cs

@@ -480,13 +480,15 @@ namespace FPJ0000
                 if (col == curyw)
                 {
                     e.Graphics.FillRectangle(Brushes.DeepSkyBlue, rect);
+                    e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
                 }
                 else
                 {
                     e.Graphics.FillRectangle(Brushes.DimGray, rect);
+                    e.Graphics.DrawString(col, this.Font, Brushes.White, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
                 }
                 e.Graphics.DrawRectangle(Pens.Black, rect.Left, rect.Top, rect.Width, rect.Height);
-                e.Graphics.DrawString(col, this.Font, Brushes.Black, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
+                
                 ci += 1;
             }
 
@@ -581,7 +583,7 @@ namespace FPJ0000
                             {
                                 e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[시작 안함]",
                             this.Font,
-                            (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime),
+                            (isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime),
                             rect2,
                             new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center }
                             );
@@ -590,7 +592,7 @@ namespace FPJ0000
                             {
                                 e.Graphics.DrawString(str + "\n" + dr.uid + $"\n\n[{dr.progress:N1}% 진행 중]",
                             this.Font,
-                            (isBusy ? (dr.progress < 1 ? Brushes.Tomato : Brushes.WhiteSmoke) : Brushes.Lime),
+                            (isBusy ? (dr.progress < 1 ? Brushes.Yellow : Brushes.WhiteSmoke) : Brushes.Lime),
                             rect2,
                             new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center }
                             );