타 부서 로그인 가능 상태 해제

Project/AdoNetEFMain.Designer.cs

@@ -1,4 +1,4 @@
-// 모델 'D:\Source\##### 완료아이템\(014) GroupWare\Source\Project\AdoNetEFMain.edmx'에 대해 T4 코드 생성이 사용됩니다. 
+// 모델 'D:\Source\##### 완료아이템\(0014) GroupWare\Source\Project\AdoNetEFMain.edmx'에 대해 T4 코드 생성이 사용됩니다. 
 // 레거시 코드 생성을 사용하려면 '코드 생성 전략' 디자이너 속성의 값을
 // 'Legacy ObjectContext'로 변경하십시오. 이 속성은 모델이 디자이너에서 열릴 때
 // 속성 창에서 사용할 수 있습니다.

Project/AdoNetEFMain.edmx

@@ -17,6 +17,7 @@
           <Property Name="state" Type="varchar" MaxLength="20" />
           <Property Name="useJobReport" Type="bit" />
           <Property Name="useUserState" Type="bit" />
+          <Property Name="exceptHoly" Type="bit" />
           <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
           <Property Name="wdate" Type="smalldatetime" Nullable="false" />
         </EntityType>
@@ -90,12 +91,21 @@
           <Property Name="remark" Type="nvarchar" MaxLength="255" />
           <Property Name="hrs" Type="float" />
           <Property Name="ot" Type="float" />
+          <Property Name="otStart" Type="datetime" />
+          <Property Name="otEnd" Type="datetime" />
           <Property Name="import" Type="bit" />
           <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
           <Property Name="wdate" Type="smalldatetime" Nullable="false" />
           <Property Name="description2" Type="nvarchar(max)" />
           <Property Name="tag" Type="varchar" MaxLength="255" />
           <Property Name="autoinput" Type="bit" />
+          <Property Name="kisullv" Type="varchar" MaxLength="10" />
+          <Property Name="kisuldiv" Type="varchar" MaxLength="100" />
+          <Property Name="kisulamt" Type="decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="float" />
+          <Property Name="otReason" Type="varchar" MaxLength="255" />
+          <Property Name="otwuid" Type="varchar" MaxLength="20" />
+          <Property Name="ottime" Type="datetime" />
         </EntityType>
         <EntityType Name="Projects">
           <Key>
@@ -128,6 +138,9 @@
           <Property Name="ddate" Type="varchar" MaxLength="50" />
           <Property Name="edate" Type="varchar" MaxLength="50" />
           <Property Name="odate" Type="varchar" MaxLength="50" />
+          <Property Name="bdate" Type="varchar" MaxLength="50" />
+          <Property Name="qdate" Type="varchar" MaxLength="50" />
+          <Property Name="cdate" Type="varchar" MaxLength="50" />
           <Property Name="progress" Type="int" />
           <Property Name="memo" Type="nvarchar" MaxLength="255" />
           <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
@@ -141,9 +154,12 @@
           <Property Name="CMP_Description" Type="nvarchar(max)" />
           <Property Name="CMP_Before" Type="nvarchar(max)" />
           <Property Name="CMP_After" Type="nvarchar(max)" />
+          <Property Name="CMP_After2" Type="nvarchar(max)" />
           <Property Name="bCost" Type="bit" />
           <Property Name="bFanOut" Type="bit" />
           <Property Name="div" Type="varchar" MaxLength="2" />
+          <Property Name="model" Type="varchar" MaxLength="50" />
+          <Property Name="serial" Type="varchar" MaxLength="50" />
           <Property Name="EB_Site" Type="varchar" MaxLength="20" />
           <Property Name="EB_Line" Type="varchar" MaxLength="10" />
           <Property Name="EB_Team" Type="varchar" MaxLength="10" />
@@ -153,6 +169,7 @@
           <Property Name="EB_ConstNew" Type="float" />
           <Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
           <Property Name="bAlert" Type="bit" />
+          <Property Name="championid" Type="varchar" MaxLength="20" />
         </EntityType>
         <EntityType Name="ProjectsHistory">
           <Key>
@@ -231,6 +248,9 @@
           <Property Name="bbuy" Type="bit" />
           <Property Name="bconfirm" Type="bit" />
           <Property Name="bCancel" Type="bit" />
+          <Property Name="reqUser" Type="varchar" MaxLength="30" />
+          <Property Name="recvUser" Type="nvarchar" MaxLength="30" />
+          <Property Name="recvDate" Type="varchar" MaxLength="10" />
         </EntityType>
         <EntityType Name="Purchase">
           <Key>
@@ -251,6 +271,7 @@
           <Property Name="pumunit" Type="varchar" MaxLength="50" />
           <Property Name="pumqty" Type="int" />
           <Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
+          <Property Name="pumpriceD" Type="decimal" Precision="18" Scale="2" />
           <Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
           <Property Name="supply" Type="varchar" MaxLength="200" />
           <Property Name="supplyidx" Type="int" />
@@ -280,6 +301,9 @@
           <Property Name="path_kj" Type="nvarchar" MaxLength="100" />
           <Property Name="advpurchase" Type="bit" />
           <Property Name="permission" Type="int" />
+          <Property Name="advkisul" Type="bit" />
+          <Property Name="managerinfo" Type="varchar" MaxLength="255" />
+          <Property Name="devinfo" Type="varchar" MaxLength="255" />
         </EntityType>
         <EntityType Name="Users">
           <Key>
@@ -335,6 +359,7 @@
         <EntityType Name="vGroupUser">
           <Key>
             <PropertyRef Name="gcode" />
+            
           </Key>
           <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
           <Property Name="dept" Type="varchar" MaxLength="100" />
@@ -352,11 +377,13 @@
           <Property Name="ads_title" Type="nvarchar" MaxLength="100" />
           <Property Name="ads_created" Type="varchar" MaxLength="50" />
           <Property Name="memo" Type="nvarchar" MaxLength="255" />
-          <Property Name="processs" Type="varchar" MaxLength="50" />
+          <Property Name="processs" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="id" Type="varchar" MaxLength="20" />
           <Property Name="state" Type="varchar" MaxLength="20" />
           <Property Name="useJobReport" Type="bit" />
           <Property Name="useUserState" Type="bit" />
+          <Property Name="password" Type="varchar" MaxLength="50" />
+          <Property Name="exceptHoly" Type="bit" />
         </EntityType>
         <EntityContainer Name="EEModelMainStoreContainer">
           <EntitySet Name="EETGW_GroupUser" EntityType="Self.EETGW_GroupUser" Schema="dbo" store:Type="Tables" />
@@ -410,7 +437,9 @@
     [vGroupUser].[id] AS [id], 
     [vGroupUser].[state] AS [state], 
     [vGroupUser].[useJobReport] AS [useJobReport], 
-    [vGroupUser].[useUserState] AS [useUserState]
+    [vGroupUser].[useUserState] AS [useUserState], 
+    [vGroupUser].[password] AS [password], 
+    [vGroupUser].[exceptHoly] AS [exceptHoly]
     FROM [dbo].[vGroupUser] AS [vGroupUser]</DefiningQuery>
           </EntitySet>
         </EntityContainer>
@@ -427,6 +456,9 @@
           <Property Name="path_kj" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="advpurchase" Type="Boolean" />
           <Property Name="permission" Type="Int32" />
+          <Property Name="advkisul" Type="Boolean" />
+          <Property Name="managerinfo" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="devinfo" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityContainer Name="EEEntitiesMain" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="UserGroup" EntityType="Self.UserGroup" />
@@ -497,6 +529,7 @@
           <Property Name="useUserState" Type="Boolean" />
           <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
           <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+          <Property Name="exceptHoly" Type="Boolean" />
         </EntityType>
         <EntityType Name="vGroupUser">
           <Key>
@@ -518,11 +551,13 @@
           <Property Name="ads_title" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <Property Name="ads_created" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
-          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="processs" Type="String" MaxLength="50" FixedLength="false" Unicode="false" Nullable="false" />
           <Property Name="id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
           <Property Name="state" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
           <Property Name="useJobReport" Type="Boolean" />
           <Property Name="useUserState" Type="Boolean" />
+          <Property Name="password" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="exceptHoly" Type="Boolean" />
         </EntityType>
         <EntityType Name="EETGW_JobReport_AutoInput">
           <Key>
@@ -577,6 +612,15 @@
           <Property Name="description2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="tag" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
           <Property Name="autoinput" Type="Boolean" />
+          <Property Name="otStart" Type="DateTime" Precision="3" />
+          <Property Name="otEnd" Type="DateTime" Precision="3" />
+          <Property Name="kisullv" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="kisuldiv" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="kisulamt" Type="Decimal" Precision="18" Scale="3" />
+          <Property Name="ot2" Type="Double" />
+          <Property Name="otReason" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="otwuid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="ottime" Type="DateTime" Precision="3" />
         </EntityType>
         <EntityType Name="vFindSID">
           <Key>
@@ -655,6 +699,13 @@
           <Property Name="EB_ConstNew" Type="Double" />
           <Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
           <Property Name="bAlert" Type="Boolean" />
+          <Property Name="bdate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="qdate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="cdate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="CMP_After2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="model" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="serial" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="championid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="ProjectsHistory">
           <Key>
@@ -733,6 +784,9 @@
           <Property Name="bbuy" Type="Boolean" />
           <Property Name="bconfirm" Type="Boolean" />
           <Property Name="bCancel" Type="Boolean" />
+          <Property Name="reqUser" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
+          <Property Name="recvUser" Type="String" MaxLength="30" FixedLength="false" Unicode="true" />
+          <Property Name="recvDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="Purchase">
           <Key>
@@ -772,6 +826,7 @@
           <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
           <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
           <Property Name="inqty" Type="Int32" />
+          <Property Name="pumpriceD" Type="Decimal" Precision="18" Scale="2" />
         </EntityType>
         <EntityType Name="HolidayLIst">
           <Key>
@@ -793,6 +848,9 @@
           <EntitySetMapping Name="UserGroup">
             <EntityTypeMapping TypeName="EEModelMain.UserGroup">
               <MappingFragment StoreEntitySet="UserGroup">
+                <ScalarProperty Name="devinfo" ColumnName="devinfo" />
+                <ScalarProperty Name="managerinfo" ColumnName="managerinfo" />
+                <ScalarProperty Name="advkisul" ColumnName="advkisul" />
                 <ScalarProperty Name="dept" ColumnName="dept" />
                 <ScalarProperty Name="gcode" ColumnName="gcode" />
                 <ScalarProperty Name="path_kj" ColumnName="path_kj" />
@@ -844,6 +902,7 @@
           <EntitySetMapping Name="EETGW_GroupUser">
             <EntityTypeMapping TypeName="EEModelMain.EETGW_GroupUser">
               <MappingFragment StoreEntitySet="EETGW_GroupUser">
+                <ScalarProperty Name="exceptHoly" ColumnName="exceptHoly" />
                 <ScalarProperty Name="wdate" ColumnName="wdate" />
                 <ScalarProperty Name="wuid" ColumnName="wuid" />
                 <ScalarProperty Name="useUserState" ColumnName="useUserState" />
@@ -860,6 +919,8 @@
           <EntitySetMapping Name="vGroupUser">
             <EntityTypeMapping TypeName="EEModelMain.vGroupUser">
               <MappingFragment StoreEntitySet="vGroupUser">
+                <ScalarProperty Name="exceptHoly" ColumnName="exceptHoly" />
+                <ScalarProperty Name="password" ColumnName="password" />
                 <ScalarProperty Name="useUserState" ColumnName="useUserState" />
                 <ScalarProperty Name="useJobReport" ColumnName="useJobReport" />
                 <ScalarProperty Name="state" ColumnName="state" />
@@ -916,6 +977,15 @@
           <EntitySetMapping Name="JobReport">
             <EntityTypeMapping TypeName="EEModelMain.JobReport">
               <MappingFragment StoreEntitySet="JobReport">
+                <ScalarProperty Name="ottime" ColumnName="ottime" />
+                <ScalarProperty Name="otwuid" ColumnName="otwuid" />
+                <ScalarProperty Name="otReason" ColumnName="otReason" />
+                <ScalarProperty Name="ot2" ColumnName="ot2" />
+                <ScalarProperty Name="kisulamt" ColumnName="kisulamt" />
+                <ScalarProperty Name="kisuldiv" ColumnName="kisuldiv" />
+                <ScalarProperty Name="kisullv" ColumnName="kisullv" />
+                <ScalarProperty Name="otEnd" ColumnName="otEnd" />
+                <ScalarProperty Name="otStart" ColumnName="otStart" />
                 <ScalarProperty Name="autoinput" ColumnName="autoinput" />
                 <ScalarProperty Name="tag" ColumnName="tag" />
                 <ScalarProperty Name="description2" ColumnName="description2" />
@@ -961,6 +1031,13 @@
           <EntitySetMapping Name="Projects">
             <EntityTypeMapping TypeName="EEModelMain.Projects">
               <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="championid" ColumnName="championid" />
+                <ScalarProperty Name="serial" ColumnName="serial" />
+                <ScalarProperty Name="model" ColumnName="model" />
+                <ScalarProperty Name="CMP_After2" ColumnName="CMP_After2" />
+                <ScalarProperty Name="cdate" ColumnName="cdate" />
+                <ScalarProperty Name="qdate" ColumnName="qdate" />
+                <ScalarProperty Name="bdate" ColumnName="bdate" />
                 <ScalarProperty Name="bAlert" ColumnName="bAlert" />
                 <ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
                 <ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
@@ -1063,6 +1140,9 @@
           <EntitySetMapping Name="ProjectsPart">
             <EntityTypeMapping TypeName="EEModelMain.ProjectsPart">
               <MappingFragment StoreEntitySet="ProjectsPart">
+                <ScalarProperty Name="recvDate" ColumnName="recvDate" />
+                <ScalarProperty Name="recvUser" ColumnName="recvUser" />
+                <ScalarProperty Name="reqUser" ColumnName="reqUser" />
                 <ScalarProperty Name="bCancel" ColumnName="bCancel" />
                 <ScalarProperty Name="bconfirm" ColumnName="bconfirm" />
                 <ScalarProperty Name="bbuy" ColumnName="bbuy" />
@@ -1101,6 +1181,7 @@
           <EntitySetMapping Name="Purchase">
             <EntityTypeMapping TypeName="EEModelMain.Purchase">
               <MappingFragment StoreEntitySet="Purchase">
+                <ScalarProperty Name="pumpriceD" ColumnName="pumpriceD" />
                 <ScalarProperty Name="inqty" ColumnName="inqty" />
                 <ScalarProperty Name="wdate" ColumnName="wdate" />
                 <ScalarProperty Name="wuid" ColumnName="wuid" />

Project/Dialog/fLogin.cs

@@ -115,11 +115,11 @@ namespace Project.Dialog
             //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
             try
             {
-				var userGcode=FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{id}','{encpass}')");
+                var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
                 //var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
                 if (String.IsNullOrEmpty(userGcode))
                 {
-					Util.MsgE("입력한 사용자 계정이 존재하지 않습니다\n관리자에 문의 하세요");
+                    Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
                     tbPW.SelectAll();
                     tbPW.Focus();
                     return;
@@ -134,6 +134,14 @@ namespace Project.Dialog
                 var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
                 var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
 
+                //var deptname = cmbDept.Text.Trim();
+                //var seldeptcode = cmbDept.SelectedValue.ToString();
+                //if (deptname.Equals(userdr.dept) == false)
+                //{
+                //    Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
+                //    return;
+                //}
+
                 //var userdr = users.Rows[0] as dsMSSQL.UsersRow;
                 //var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
                 //var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0;
@@ -186,7 +194,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.id == "dev" ? "개발자": 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;

Project/EETGW.csproj

@@ -452,7 +452,7 @@
       <DependentUpon>AdoNetEFMain.tt</DependentUpon>
     </Compile>
     <Compile Include="Purchase.cs">
-      <DependentUpon>ModelPurchase.tt</DependentUpon>
+      <DependentUpon>AdoNetEFMain.tt</DependentUpon>
     </Compile>
     <Compile Include="Settings.cs" />
     <Compile Include="SqlServerTypes\Loader.cs" />

Project/EETGW_GroupUser.cs

@@ -24,5 +24,6 @@ namespace Project
         public Nullable<bool> useUserState { get; set; }
         public string wuid { get; set; }
         public System.DateTime wdate { get; set; }
+        public Nullable<bool> exceptHoly { get; set; }
     }
 }

Project/JobReport.cs

@@ -35,5 +35,14 @@ namespace Project
         public string description2 { get; set; }
         public string tag { get; set; }
         public Nullable<bool> autoinput { get; set; }
+        public Nullable<System.DateTime> otStart { get; set; }
+        public Nullable<System.DateTime> otEnd { get; set; }
+        public string kisullv { get; set; }
+        public string kisuldiv { get; set; }
+        public Nullable<decimal> kisulamt { get; set; }
+        public Nullable<double> ot2 { get; set; }
+        public string otReason { get; set; }
+        public string otwuid { get; set; }
+        public Nullable<System.DateTime> ottime { get; set; }
     }
 }

Project/Projects.cs

@@ -66,5 +66,12 @@ namespace Project
         public Nullable<double> EB_ConstNew { get; set; }
         public string EB_BoardName { get; set; }
         public Nullable<bool> bAlert { get; set; }
+        public string bdate { get; set; }
+        public string qdate { get; set; }
+        public string cdate { get; set; }
+        public string CMP_After2 { get; set; }
+        public string model { get; set; }
+        public string serial { get; set; }
+        public string championid { get; set; }
     }
 }

Project/ProjectsPart.cs

@@ -46,5 +46,8 @@ namespace Project
         public Nullable<bool> bbuy { get; set; }
         public Nullable<bool> bconfirm { get; set; }
         public Nullable<bool> bCancel { get; set; }
+        public string reqUser { get; set; }
+        public string recvUser { get; set; }
+        public string recvDate { get; set; }
     }
 }

Project/Properties/AssemblyInfo.cs

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

Project/UserGroup.cs

@@ -19,5 +19,8 @@ namespace Project
         public string path_kj { get; set; }
         public Nullable<bool> advpurchase { get; set; }
         public Nullable<int> permission { get; set; }
+        public Nullable<bool> advkisul { get; set; }
+        public string managerinfo { get; set; }
+        public string devinfo { get; set; }
     }
 }

Project/_Common/fAddNewUser.Designer.cs

@@ -64,6 +64,7 @@
             this.tbState = new System.Windows.Forms.TextBox();
             this.chkJobReport = new System.Windows.Forms.CheckBox();
             this.chkUseState = new System.Windows.Forms.CheckBox();
+            this.chkExceptHoly = new System.Windows.Forms.CheckBox();
             idLabel = new System.Windows.Forms.Label();
             passwordLabel = new System.Windows.Forms.Label();
             nameLabel = new System.Windows.Forms.Label();
@@ -364,31 +365,42 @@
             this.tbState.Size = new System.Drawing.Size(200, 29);
             this.tbState.TabIndex = 34;
             // 
-			// chkUserSt
+            // chkJobReport
             // 
             this.chkJobReport.AutoSize = true;
             this.chkJobReport.Location = new System.Drawing.Point(407, 262);
-			this.chkJobReport.Name = "chkUserSt";
+            this.chkJobReport.Name = "chkJobReport";
             this.chkJobReport.Size = new System.Drawing.Size(93, 25);
             this.chkJobReport.TabIndex = 36;
             this.chkJobReport.Text = "업무일지";
             this.chkJobReport.UseVisualStyleBackColor = true;
             this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged);
             // 
-			// chkUseSta
+            // chkUseState
             // 
             this.chkUseState.AutoSize = true;
             this.chkUseState.Location = new System.Drawing.Point(503, 260);
-			this.chkUseState.Name = "chkUseSta";
+            this.chkUseState.Name = "chkUseState";
             this.chkUseState.Size = new System.Drawing.Size(93, 25);
             this.chkUseState.TabIndex = 37;
             this.chkUseState.Text = "계정사용";
             this.chkUseState.UseVisualStyleBackColor = true;
             // 
+            // checkBox1
+            // 
+            this.chkExceptHoly.AutoSize = true;
+            this.chkExceptHoly.Location = new System.Drawing.Point(311, 260);
+            this.chkExceptHoly.Name = "checkBox1";
+            this.chkExceptHoly.Size = new System.Drawing.Size(93, 25);
+            this.chkExceptHoly.TabIndex = 38;
+            this.chkExceptHoly.Text = "휴가제외";
+            this.chkExceptHoly.UseVisualStyleBackColor = true;
+            // 
             // fAddNewUser
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(601, 355);
+            this.Controls.Add(this.chkExceptHoly);
             this.Controls.Add(this.chkUseState);
             this.Controls.Add(this.chkJobReport);
             this.Controls.Add(label6);
@@ -457,5 +469,6 @@
         private System.Windows.Forms.TextBox tbState;
         private System.Windows.Forms.CheckBox chkJobReport;
 		private System.Windows.Forms.CheckBox chkUseState;
+        private System.Windows.Forms.CheckBox chkExceptHoly;
     }
 }

Project/_Common/fAddNewUser.cs

@@ -47,6 +47,7 @@ namespace Project._Common
 					tbDateO.Text = db_user.outdate;
 					tbGrade.Text = db_user.grade;
 					tbMemo.Text = db_user.memo;
+					
 				}
 				if (db_guser != null)
 				{
@@ -56,6 +57,7 @@ namespace Project._Common
 					//this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
 					this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
 					this.chkUseState.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState);
+					this.chkExceptHoly.Checked = (db_guser.exceptHoly == null ? false : (bool)db_guser.exceptHoly);
 				}
 
 				this.Text = "사용자 정보 변경";
@@ -137,6 +139,7 @@ namespace Project._Common
 				drGuser.state = this.tbState.Text.Trim();
 				drGuser.useJobReport = chkJobReport.Checked;
 				drGuser.useUserState = chkUseState.Checked;
+				drGuser.exceptHoly = chkExceptHoly.Checked;
 			}
 			else
 			{
@@ -158,6 +161,7 @@ namespace Project._Common
 				//drGuser.useJobReport = this.chkJobReport.Checked;
 				drGuser.useJobReport = this.chkJobReport.Checked;
 				drGuser.useUserState = this.chkUseState.Checked;
+				drGuser.exceptHoly = this.chkExceptHoly.Checked;	
 				db.EETGW_GroupUser.Add(drGuser);
 			}
 

Project/_Common/fUserInfo.Designer.cs

@@ -203,7 +203,7 @@
             // label4
             // 
             label4.AutoSize = true;
-            label4.Location = new System.Drawing.Point(106, 330);
+            label4.Location = new System.Drawing.Point(106, 356);
             label4.Name = "label4";
             label4.Size = new System.Drawing.Size(96, 21);
             label4.TabIndex = 27;
@@ -248,9 +248,9 @@
             // 
             // tbDept
             // 
-            this.tbDept.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "dept", true));
             this.tbDept.Location = new System.Drawing.Point(105, 119);
             this.tbDept.Name = "tbDept";
+            this.tbDept.ReadOnly = true;
             this.tbDept.Size = new System.Drawing.Size(200, 29);
             this.tbDept.TabIndex = 9;
             // 
@@ -315,7 +315,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(105, 264);
+            this.button2.Location = new System.Drawing.Point(105, 290);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(491, 54);
             this.button2.TabIndex = 26;
@@ -333,12 +333,14 @@
             this.tam.EETGW_GroupUserTableAdapter = null;
             this.tam.InventoryTableAdapter = null;
             this.tam.ItemsTableAdapter = null;
+            this.tam.JobReportTableAdapter = null;
             this.tam.LineCodeTableAdapter = null;
             this.tam.ProjectsTableAdapter = null;
             this.tam.SPMasterTableAdapter = null;
             this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             this.tam.UserGroupTableAdapter = null;
             this.tam.UsersTableAdapter = this.ta;
+            this.tam.vGroupUserTableAdapter = null;
             // 
             // tbTel
             // 
@@ -367,7 +369,7 @@
             // tbKJPath
             // 
             this.tbKJPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "level", true));
-            this.tbKJPath.Location = new System.Drawing.Point(184, 327);
+            this.tbKJPath.Location = new System.Drawing.Point(184, 353);
             this.tbKJPath.Name = "tbKJPath";
             this.tbKJPath.ReadOnly = true;
             this.tbKJPath.Size = new System.Drawing.Size(177, 29);
@@ -384,7 +386,7 @@
             // fUserInfo
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(601, 326);
+            this.ClientSize = new System.Drawing.Size(601, 351);
             this.Controls.Add(label5);
             this.Controls.Add(this.tbProcess);
             this.Controls.Add(label4);

Project/_Common/fUserInfo.cs

@@ -35,6 +35,8 @@ namespace Project._Common
             if (drGroupUser != null)
                 this.tbProcess.Text = drGroupUser.Process;
             else this.tbProcess.Text = string.Empty;
+
+            this.tbDept.Text = FCOMMON.info.Login.dept;
         }
 
         private void button1_Click(object sender, EventArgs e)
@@ -77,7 +79,7 @@ namespace Project._Common
             this.Validate();
 
             dr.name = tbNameK.Text;
-            dr.dept = tbDept.Text;
+            //dr.dept = tbDept.Text;
             dr.email = tbEmail.Text;
             dr.tel = tbTel.Text;
             dr.hp = tbHp.Text;

Project/_Common/fUserInfo.resx

@@ -165,6 +165,12 @@
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>122, 17</value>
   </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

Project/dsMSSQL.Designer.cs

@@ -4210,6 +4210,8 @@ namespace Project {
             
             private global::System.Data.DataColumn columnpassword;
             
+            private global::System.Data.DataColumn columnexceptHoly;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public vGroupUserDataTable() {
@@ -4419,6 +4421,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 exceptHolyColumn {
+                get {
+                    return this.columnexceptHoly;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -4478,7 +4488,8 @@ namespace Project {
                         string state, 
                         bool useJobReport, 
                         bool useUserState, 
-                        string password) {
+                        string password, 
+                        bool exceptHoly) {
                 vGroupUserRow rowvGroupUserRow = ((vGroupUserRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         gcode,
@@ -4502,7 +4513,8 @@ namespace Project {
                         state,
                         useJobReport,
                         useUserState,
-                        password};
+                        password,
+                        exceptHoly};
                 rowvGroupUserRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowvGroupUserRow);
                 return rowvGroupUserRow;
@@ -4555,6 +4567,7 @@ namespace Project {
                 this.columnuseJobReport = base.Columns["useJobReport"];
                 this.columnuseUserState = base.Columns["useUserState"];
                 this.columnpassword = base.Columns["password"];
+                this.columnexceptHoly = base.Columns["exceptHoly"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4604,6 +4617,8 @@ namespace Project {
                 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.columnexceptHoly = new global::System.Data.DataColumn("exceptHoly", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnexceptHoly);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columngcode,
                                 this.columnid}, true));
@@ -8359,6 +8374,22 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool exceptHoly {
+                get {
+                    if (this.IsexceptHolyNull()) {
+                        return false;
+                    }
+                    else {
+                        return ((bool)(this[this.tablevGroupUser.exceptHolyColumn]));
+                    }
+                }
+                set {
+                    this[this.tablevGroupUser.exceptHolyColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsdeptNull() {
@@ -8598,6 +8629,18 @@ namespace Project {
             public void SetpasswordNull() {
                 this[this.tablevGroupUser.passwordColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsexceptHolyNull() {
+                return this.IsNull(this.tablevGroupUser.exceptHolyColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetexceptHolyNull() {
+                this[this.tablevGroupUser.exceptHolyColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -15804,6 +15847,7 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR
             tableMapping.ColumnMappings.Add("useJobReport", "useJobReport");
             tableMapping.ColumnMappings.Add("useUserState", "useUserState");
             tableMapping.ColumnMappings.Add("password", "password");
+            tableMapping.ColumnMappings.Add("exceptHoly", "exceptHoly");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -15811,13 +15855,14 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = "UPDATE EETGW_GroupUser\r\nSET        Process = @Process, state = @state\r\nWHERE  (gc" +
+            this._adapter.UpdateCommand.CommandText = "UPDATE EETGW_GroupUser\r\nSET        Process = @Process, state = @state, exceptHoly" +
-                "ode = @gcode) AND (uid = @id)";
+                " = @exceptHoly\r\nWHERE  (gcode = @gcode) AND (uid = @id)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "processs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@exceptHoly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "exceptHoly", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.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.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15833,7 +15878,8 @@ SELECT idx, gcode, uid, level, wuid, wdate, useJobReport, useUserState, state FR
             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, password
+            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, 
+               exceptHoly
 FROM     vGroupUser
 WHERE  (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs)
 ORDER BY name";
@@ -15842,7 +15888,7 @@ ORDER BY name";
             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].CommandText = @"SELECT ads_created, ads_employNo, ads_title, dept, email, exceptHoly, 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, "", "", ""));

Project/dsMSSQL.xsd

@@ -1087,7 +1087,8 @@ 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, password
+                    <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, 
+               exceptHoly
 FROM     vGroupUser
 WHERE  (gcode = @gcode) AND (ISNULL(processs, '') LIKE @processs)
 ORDER BY name</CommandText>
@@ -1098,15 +1099,16 @@ ORDER BY name</CommandText>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE EETGW_GroupUser
-SET        Process = @Process, state = @state
+SET        Process = @Process, state = @state, exceptHoly = @exceptHoly
 WHERE  (gcode = @gcode) AND (uid = @id)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="Process" ColumnName="Process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@Process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Process" ColumnName="Process" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@Process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="Process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="state" ColumnName="state" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="state" ColumnName="state" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@state" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="state" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="exceptHoly" ColumnName="exceptHoly" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@exceptHoly" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="exceptHoly" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="id" ColumnName="uid" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -1135,12 +1137,13 @@ WHERE  (gcode = @gcode) AND (uid = @id)</CommandText>
               <Mapping SourceColumn="useJobReport" DataSetColumn="useJobReport" />
               <Mapping SourceColumn="useUserState" DataSetColumn="useUserState" />
               <Mapping SourceColumn="password" DataSetColumn="password" />
+              <Mapping SourceColumn="exceptHoly" DataSetColumn="exceptHoly" />
             </Mappings>
             <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>
+                    <CommandText>SELECT ads_created, ads_employNo, ads_title, dept, email, exceptHoly, 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" />
@@ -1369,7 +1372,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -1510,7 +1513,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_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
+        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1581,7 +1584,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_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: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: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" />
@@ -1639,7 +1642,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_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: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: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" />
@@ -1709,7 +1712,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_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: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: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" />
@@ -1767,7 +1770,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
@@ -1811,7 +1814,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_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: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: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" />
@@ -1927,7 +1930,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_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: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: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" />
@@ -1966,7 +1969,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -2082,7 +2085,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
+              <xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -2105,10 +2108,11 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="exceptHoly" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="exceptHoly" msprop:Generator_ColumnVarNameInTable="columnexceptHoly" msprop:Generator_ColumnPropNameInTable="exceptHolyColumn" msprop:Generator_UserColumnName="exceptHoly" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent">
+        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />

Project/dsMSSQL.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="348" 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="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" />

Project/vGroupUser.cs

@@ -35,5 +35,7 @@ namespace Project
         public string state { get; set; }
         public Nullable<bool> useJobReport { get; set; }
         public Nullable<bool> useUserState { get; set; }
+        public string password { get; set; }
+        public Nullable<bool> exceptHoly { get; set; }
     }
 }

SubProject/FBS0000/dsReport.Designer.cs

@@ -2703,7 +2703,8 @@ namespace FBS0000.dsReportTableAdapters {
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
+               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
 ORDER BY Holyday.uid, CrDay";
             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, "", "", ""));

SubProject/FBS0000/dsReport.xsd

@@ -16,7 +16,8 @@
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
+               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
 ORDER BY Holyday.uid, CrDay</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -166,7 +167,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
   <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_RowClassName="holydataRow" msprop:Generator_UserTableName="holydata" msprop:Generator_RowEvArgName="holydataRowChangeEvent">
+        <xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_UserTableName="holydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_RowEvArgName="holydataRowChangeEvent" msprop:Generator_RowClassName="holydataRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
@@ -211,7 +212,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent" msprop:Generator_RowClassName="Holydata_DayRow">
+        <xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_RowClassName="Holydata_DayRow" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent">
           <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" />
@@ -265,7 +266,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent" msprop:Generator_RowClassName="Holydata_TimeRow">
+        <xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_RowClassName="Holydata_TimeRow" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs

@@ -164,7 +164,6 @@ namespace FPJ0000.OtConfirm
             this.grpUser.TabIndex = 0;
             this.grpUser.TabStop = false;
             this.grpUser.Text = "신청자";
-            this.grpUser.Enter += new System.EventHandler(this.grpUser_Enter);
             // 
             // cmbUser
             // 
@@ -218,7 +217,6 @@ namespace FPJ0000.OtConfirm
             this.tbDays.Size = new System.Drawing.Size(130, 38);
             this.tbDays.TabIndex = 18;
             this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.tbDays.TextChanged += new System.EventHandler(this.tbDays_TextChanged);
             // 
             // label10
             // 
@@ -249,7 +247,6 @@ namespace FPJ0000.OtConfirm
             this.label9.Size = new System.Drawing.Size(93, 27);
             this.label9.TabIndex = 11;
             this.label9.Text = "행선지";
-            this.label9.Click += new System.EventHandler(this.label9_Click);
             // 
             // tbLocation
             // 
@@ -262,7 +259,6 @@ namespace FPJ0000.OtConfirm
             this.tbLocation.Name = "tbLocation";
             this.tbLocation.Size = new System.Drawing.Size(381, 35);
             this.tbLocation.TabIndex = 12;
-            this.tbLocation.SelectedIndexChanged += new System.EventHandler(this.tbLocation_SelectedIndexChanged);
             // 
             // label8
             // 
@@ -284,7 +280,6 @@ namespace FPJ0000.OtConfirm
             this.tbReason.Name = "tbReason";
             this.tbReason.Size = new System.Drawing.Size(310, 35);
             this.tbReason.TabIndex = 10;
-            this.tbReason.SelectedIndexChanged += new System.EventHandler(this.tbReason_SelectedIndexChanged);
             // 
             // label5
             // 

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs

@@ -201,7 +201,7 @@ namespace FPJ0000.OtConfirm
 
             //사용시간여부 확인
             var minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 문의 하세요";
-            if(IsAdmin)
+            if (IsAdmin)
                 minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 권한으로 기록은 진행 됩니다";
 
             bool oktime = false;
@@ -236,8 +236,8 @@ namespace FPJ0000.OtConfirm
             }
             if (oktime == false)
             {
-                FCOMMON.Util.MsgE(minmsg);
+                //FCOMMON.Util.MsgE(minmsg);
-                if (IsAdmin == false) return;
+                //if (IsAdmin == false) return;
             }
 
             //   return;
@@ -396,35 +396,6 @@ namespace FPJ0000.OtConfirm
                 UpdateStatus();
         }
 
-        private void label11_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void tbDays_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void grpUser_Enter(object sender, EventArgs e)
-        {
-
-        }
-
-        private void tbLocation_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void tbReason_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void label9_Click(object sender, EventArgs e)
-        {
-
-        }
 
         Dictionary<string, string> holydata = new Dictionary<string, string>();
 
@@ -437,9 +408,11 @@ namespace FPJ0000.OtConfirm
             if (uid.isEmpty()) return;
 
 
-            holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString());
+            var basedate = DateTime.Now.AddDays(-1).ToShortDateString();
+            holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, basedate);
 
             this.richTextBox1.Clear();
+            if (holydata.Any()) richTextBox1.AppendText($"[기준:{basedate}] => ");
             foreach (var item in holydata)
             {
                 var val = item.Value.Split('|');

SubProject/FPJ0000/Project/fPartBuyStatus.resx

@@ -331,20 +331,20 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
-        Zipm3uYUTU10YZAtppHX0ESFClGKXlRoF53a1Dnn3IZbZC5Tm/MueFnqLudsO9NvzzlbaiD0gw/Pi+d8
+        Zipm3uYUTU10YZAtpqGpC01UqBCl6EWFdtGpTZ1zTjfcInOZ2pw6L+Blqbuc43am355zttRA6AcfnhfP
-        P5zf9xweO2EPFMmXKzWy6CrN73CxhiInzVHNnlo6ulJNR5arDOdEylr/mLcHuNDeiXg8qFyx0GsGg8Ft
+        +X44v+85PHbCHiiTL1dq5NFVmt/hYg1FTppDyp5aOrpyiI58ojacE6lq/GPeHuBCeyfi8YBq2UqvGgwG
-        tjlgtu6yZmGh8XPJguJPc4ivGrfzc6Q+3qhnospUK2xYPeOCdpaBdo6BZoaBatoJxS8HusZscDBA+ziF
+        t8W+CYttl1UrC42fi1YUfzIjvmrcwc+R+XijnokqVy+z4aEZF7SzDLRmBpoZBuppJ5S/NtE5ZscmA7SN
-        4g+zSHtmoP6RhIu7qE27E/p5N77OM+RkMMxJnBgwOvBlzE4EW9AvuaFddKFUOoeQ+31vuHBcdbDppjhm
+        Uyj+MIu0ZwbqH0m4uJPacDihn3Pj6xxDTgbDnMSJfuMmvow5iGAL+kU3tAsulMrMCLnf+4YLx0mDTTfF
-        W9hwHWn1N1Df3YKS1mqEiAMQTOCXnkWY5BRq2mu4Vaw0g+V1O8KSBhhOEFsZ8r5vtAMdky9RrynkJEl1
+        MdvC+utIq7uBuq5mlLRIESIOQDCBX3oWYZJTqG6r5lax0QyW1hwIS+pnOEFsZcj73tF2tE++RJ2mkJMk
-        kSh8nYjclngIGq8gtTEV7SPL6DBY8fn7JjZIT+GSQZoT8Gv5Pv7iPLdmoh+vRiWoUORwkuSGKBK+iszn
+        1Uai8HUicpvjIWi4gtSGVLSNLKHdYMPn7xtYJz2FSwZoTsCv4fv4i/Pcmok+vBqVoEKZw0mS66NI+Coy
-        GVAabdwqvZMUZKSHdZsL4SVDHgE7EWUDdH5TCnRGFRq19/CkpwBx1ReRXBcD3YwdOlIsW7ByytOJmQjC
+        n2dAZbRzq/RMUpCTHtbsLoSXDHoE7ESU99P5jSnQGdVo0N5DWXcB4qQXkVwbA92MAzpSLFuwasrTiYUI
-        JHsE5x+KXaeLjiCxlg/9lBql/VmQSPMR/zQULYqP+LbAQEeKVU+7MERYsbgQ8sgrOCHyFQaJDiO3OQG3
+        wiR7BOcfil2ni44gsYYP/dQQSvuyIJHlI/5pKJqVH/FtnoGOFDs07cIgYdnqQsgjr+CEyFcYJDqM3KYE
-        GiKQUHOJk+RLEyFqzSBvEgr2Xj/nxjD7iQkWUmRgnsojCBIdXAgSHSIP+SKo0BfXKkKR/SIFyjEZSmVF
+        3KqPQEL1JU6SL0uEqCWDvEko2Hu92Y1h9hMTrKTIwDy1RxAkOjgfJDpEHvJFUKEvrlWEIvtFClRjcpTK
-        yHqXAkFDLHREoCX/hoYIaNcWESh2V7iQN0gvbdAYWXBzDEws4m5TJtJJUNgYj4LmOzt3LHanmwjadgWs
+        i5D1LgWC+ljoiEBL/g0NEdCuLSJQ7q5wIW+AXlynMTLv5uifWMDdxkykk6CwIR4FTXd27lgcTjcRtO4K
-        bd68K/gfNnaFjD2CM/lyu1hcvr3fw/shl8u3jiW1W71xUmRmj2l2025hL0yrFEwrFIxeVq0uDrZ5K+0J
+        WNucZVfwP+zsChl7BGfyFQ6xuGx7v4f3Q6FQbB1LarN546TIzG7T7IbDyl6YViiYlikYvazYXBxs8zba
-        UxS14Xe784c3zuOdzOzODhR09RwXysyBwjZ6h3QPAX8RtNF+gs71o6mdvQEp0jQej8f7A8h4nb60ARZQ
+        E6Yoat3vdscPb5zHO5nZlR0o6Ow+LpRbAoWt9A7pHgL+Imil/QQda0dTO3oCUmRpPB6P9wfHCJ28kSNT
-        AAAAAElFTkSuQmCC
+        iAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">