otPMS추가(테스트버젼)

2025-07-02 23:41:25 +09:00
parent cc4430a553
commit 4f4625b56b
42 changed files with 6901 additions and 3122 deletions
--- a/SubProject/FBS0000/FBS0000.csproj
+++ b/SubProject/FBS0000/FBS0000.csproj
@@ -305,6 +305,7 @@
    <None Include="dsReport.xsd">
      <Generator>MSDataSetGenerator</Generator>
      <SubType>Designer</SubType>
+      <LastGenOutput>dsReport1.Designer.cs</LastGenOutput>
    </None>
    <None Include="dsReport.xss">
      <DependentUpon>dsReport.xsd</DependentUpon>
--- a/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs
+++ b/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs
@@ -30,7 +30,7 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayData));
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
            this.bsDay = new System.Windows.Forms.BindingSource(this.components);
            this.dsReport = new FBS0000.dsReport();
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -164,9 +164,11 @@
            // 
            // cmbType
            // 
+            this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbType.Items.AddRange(new object[] {
            "일반 원장",
-            "대체 원장"});
+            "대체 원장",
+            "PMS 원장"});
            this.cmbType.Name = "cmbType";
            this.cmbType.Size = new System.Drawing.Size(150, 37);
            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
@@ -175,9 +177,9 @@
            // reportViewer1
            // 
            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource2.Name = "DataSet1";
-            reportDataSource2.Value = this.bsDay;
-            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
+            reportDataSource1.Name = "DataSet1";
+            reportDataSource1.Value = this.bsDay;
+            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyData.rdlc";
            this.reportViewer1.Location = new System.Drawing.Point(0, 37);
            this.reportViewer1.Name = "reportViewer1";
@@ -207,7 +209,6 @@
            this.Controls.Add(this.reportViewer1);
            this.Controls.Add(this.toolStrip1);
            this.Name = "fHolyDayData";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "근태 원장";
            this.Load += new System.EventHandler(this.rJobReport_Load);
            ((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit();
--- a/SubProject/FBS0000/Holiday/fHolyDayData.cs
+++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs
@@ -70,7 +70,7 @@ namespace FBS0000
                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
            }
-            else
+            else if (cmbType.SelectedIndex == 1)    //대체
            {
                taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                dsReport.Holydata_Day.Clear();
@@ -78,10 +78,19 @@ namespace FBS0000
                dsReport.Holydata_Day.AcceptChanges();
                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
            }
+            else     //PMS
+            {
+                var tapms = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
+                tapms.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
+                dsReport.Holydata_Day.Clear();
+                dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
+                dsReport.Holydata_Day.AcceptChanges();
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
+            }
+
+


-            
-            
            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
            this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
--- a/SubProject/FBS0000/Holiday/fHolyDayData.resx
+++ b/SubProject/FBS0000/Holiday/fHolyDayData.resx
@@ -123,9 +123,6 @@
  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>119, 17</value>
  </metadata>
--- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs
+++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs
@@ -30,7 +30,7 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayDataSum));
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
            this.bsDay = new System.Windows.Forms.BindingSource(this.components);
            this.dsReport = new FBS0000.dsReport();
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -143,9 +143,11 @@
            // 
            // cmbType
            // 
+            this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbType.Items.AddRange(new object[] {
            "일반 원장",
-            "대체 원장"});
+            "대체 원장",
+            "PMS 원장"});
            this.cmbType.Name = "cmbType";
            this.cmbType.Size = new System.Drawing.Size(150, 37);
            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
@@ -154,9 +156,9 @@
            // reportViewer1
            // 
            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet1";
-            reportDataSource1.Value = this.bsDay;
-            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
+            reportDataSource2.Name = "DataSet1";
+            reportDataSource2.Value = this.bsDay;
+            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc";
            this.reportViewer1.Location = new System.Drawing.Point(0, 37);
            this.reportViewer1.Name = "reportViewer1";
--- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs
+++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs
@@ -85,7 +85,7 @@ namespace FBS0000
                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
            }
-            else
+            else if(cmbType.SelectedIndex == 1)
            {
                taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
                dsReport.Holydata_Day.Clear();
@@ -93,8 +93,16 @@ namespace FBS0000
                dsReport.Holydata_Day.AcceptChanges();
                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
            }
+            else //pms
+            {
+                var taPMS = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
+                taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
+                dsReport.Holydata_Day.Clear();
+                dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
+                dsReport.Holydata_Day.AcceptChanges();
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
+            }

-            
            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
            this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
--- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx
+++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx
@@ -123,6 +123,9 @@
  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>119, 17</value>
  </metadata>
--- a/SubProject/FBS0000/Holiday/rHolyData.rdlc
+++ b/SubProject/FBS0000/Holiday/rHolyData.rdlc
@@ -748,6 +748,7 @@
                              <Style>
                                <FontFamily>맑은 고딕</FontFamily>
                                <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                <Color>#333333</Color>
                              </Style>
                            </TextRun>
@@ -786,6 +787,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -801,6 +803,7 @@
                              <Style>
                                <FontFamily>맑은 고딕</FontFamily>
                                <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                <Color>#333333</Color>
                              </Style>
                            </TextRun>
@@ -839,6 +842,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -854,6 +858,7 @@
                              <Style>
                                <FontFamily>맑은 고딕</FontFamily>
                                <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                <Color>#333333</Color>
                              </Style>
                            </TextRun>
@@ -892,6 +897,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -946,6 +952,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -1173,6 +1180,7 @@
                              <Style>
                                <FontFamily>맑은 고딕</FontFamily>
                                <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                <Color>#333333</Color>
                              </Style>
                            </TextRun>
@@ -1212,6 +1220,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -1227,6 +1236,7 @@
                              <Style>
                                <FontFamily>맑은 고딕</FontFamily>
                                <FontWeight>Normal</FontWeight>
+                                <Format>N1</Format>
                                <Color>#333333</Color>
                              </Style>
                            </TextRun>
@@ -1266,6 +1276,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -1321,6 +1332,7 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
--- a/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc
+++ b/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc
@@ -81,7 +81,9 @@
                          <TextRuns>
                            <TextRun>
                              <Value>=Sum(Fields!Dr.Value)</Value>
-                              <Style />
+                              <Style>
+                                <Format>N1</Format>
+                              </Style>
                            </TextRun>
                          </TextRuns>
                          <Style />
@@ -112,7 +114,9 @@
                          <TextRuns>
                            <TextRun>
                              <Value>=Sum(Fields!Cr.Value)</Value>
-                              <Style />
+                              <Style>
+                                <Format>N1</Format>
+                              </Style>
                            </TextRun>
                          </TextRuns>
                          <Style />
@@ -229,7 +233,6 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
-                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
                <TablixCell>
@@ -262,7 +265,6 @@
                        <PaddingBottom>2pt</PaddingBottom>
                      </Style>
                    </Textbox>
-                    <rd:Selected>true</rd:Selected>
                  </CellContents>
                </TablixCell>
              </TablixCells>
@@ -661,7 +663,6 @@
                      <PaddingBottom>2pt</PaddingBottom>
                    </Style>
                  </Textbox>
-                  <rd:Selected>true</rd:Selected>
                </CellContents>
              </TablixHeader>
              <TablixMembers>
--- a/SubProject/FBS0000/dsMSSQL.Designer.cs
+++ b/SubProject/FBS0000/dsMSSQL.Designer.cs
@@ -3121,6 +3121,8 @@ namespace FBS0000 {
            
            private global::System.Data.DataColumn columnoutdate;
            
+            private global::System.Data.DataColumn columnotPMS;
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
            public vJobReportForUserDataTable() {
@@ -3346,6 +3348,14 @@ namespace FBS0000 {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn otPMSColumn {
+                get {
+                    return this.columnotPMS;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
            [global::System.ComponentModel.Browsable(false)]
@@ -3407,7 +3417,8 @@ namespace FBS0000 {
                        string otReason, 
                        string grade, 
                        string indate, 
-                        string outdate) {
+                        string outdate, 
+                        double otPMS) {
                vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
                object[] columnValuesArray = new object[] {
                        idx,
@@ -3433,7 +3444,8 @@ namespace FBS0000 {
                        otReason,
                        grade,
                        indate,
-                        outdate};
+                        outdate,
+                        otPMS};
                rowvJobReportForUserRow.ItemArray = columnValuesArray;
                this.Rows.Add(rowvJobReportForUserRow);
                return rowvJobReportForUserRow;
@@ -3480,6 +3492,7 @@ namespace FBS0000 {
                this.columngrade = base.Columns["grade"];
                this.columnindate = base.Columns["indate"];
                this.columnoutdate = base.Columns["outdate"];
+                this.columnotPMS = base.Columns["otPMS"];
            }
            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3533,6 +3546,8 @@ namespace FBS0000 {
                base.Columns.Add(this.columnindate);
                this.columnoutdate = new global::System.Data.DataColumn("outdate", typeof(string), null, global::System.Data.MappingType.Element);
                base.Columns.Add(this.columnoutdate);
+                this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnotPMS);
                this.columnidx.AllowDBNull = false;
                this.columnpdate.MaxLength = 10;
                this.columngcode.AllowDBNull = false;
@@ -6352,6 +6367,22 @@ namespace FBS0000 {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double otPMS {
+                get {
+                    if (this.IsotPMSNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tablevJobReportForUser.otPMSColumn]));
+                    }
+                }
+                set {
+                    this[this.tablevJobReportForUser.otPMSColumn] = value;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
            public bool IspdateNull() {
@@ -6615,6 +6646,18 @@ namespace FBS0000 {
            public void SetoutdateNull() {
                this[this.tablevJobReportForUser.outdateColumn] = global::System.Convert.DBNull;
            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsotPMSNull() {
+                return this.IsNull(this.tablevJobReportForUser.otPMSColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetotPMSNull() {
+                this[this.tablevJobReportForUser.otPMSColumn] = global::System.Convert.DBNull;
+            }
        }
        
        /// <summary>
@@ -10887,6 +10930,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM
            tableMapping.ColumnMappings.Add("grade", "grade");
            tableMapping.ColumnMappings.Add("indate", "indate");
            tableMapping.ColumnMappings.Add("outdate", "outdate");
+            tableMapping.ColumnMappings.Add("otPMS", "otPMS");
            this._adapter.TableMappings.Add(tableMapping);
        }
        
@@ -10903,7 +10947,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM
            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
            this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = @"SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate
+            this._commandCollection[0].CommandText = @"SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate, 
+               otPMS
 FROM     vJobReportForUser
 WHERE  (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
 ORDER BY pdate";
--- a/SubProject/FBS0000/dsMSSQL.xsd
+++ b/SubProject/FBS0000/dsMSSQL.xsd
@@ -708,7 +708,8 @@ WHERE  (gcode = @gcode) AND (empno = @empno)</CommandText>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate
+                    <CommandText>SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate, 
+               otPMS
 FROM     vJobReportForUser
 WHERE  (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
 ORDER BY pdate</CommandText>
@@ -746,6 +747,7 @@ ORDER BY pdate</CommandText>
              <Mapping SourceColumn="grade" DataSetColumn="grade" />
              <Mapping SourceColumn="indate" DataSetColumn="indate" />
              <Mapping SourceColumn="outdate" DataSetColumn="outdate" />
+              <Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
            </Mappings>
            <Sources />
          </TableAdapter>
@@ -1120,7 +1122,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
              </xs:element>
              <xs:element name="extidx" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="extidx" msprop:Generator_UserColumnName="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" type="xs:int" minOccurs="0" />
              <xs:element name="lock" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="_lock" msprop:Generator_UserColumnName="lock" msprop:Generator_ColumnVarNameInTable="columnlock" type="xs:boolean" minOccurs="0" />
-              <xs:element name="iwol" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnVarNameInTable="columniwol" msprop:Generator_UserColumnName="iwol" type="xs:boolean" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
@@ -1382,6 +1384,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
+              <xs:element name="otPMS" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="otPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnVarNameInTable="columnotPMS" type="xs:double" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
--- a/SubProject/FBS0000/dsMSSQL.xss
+++ b/SubProject/FBS0000/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:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="114" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:minutes" ZOrder="10" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:Board" ZOrder="9" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
--- a/SubProject/FBS0000/dsReport.Designer.cs
+++ b/SubProject/FBS0000/dsReport.Designer.cs
--- a/SubProject/FBS0000/dsReport.xsd
+++ b/SubProject/FBS0000/dsReport.xsd
@@ -139,7 +139,7 @@ FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
               EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
               Users WITH (NOLOCK) ON Holyday.uid = Users.id
 WHERE  (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) &lt;&gt; 0) AND 
-               (EETGW_GroupUser.useUserState = 1)
+               (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate &lt;&gt; 'PMS')
 ORDER BY Holyday.sdate, Holyday.idx</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" />
@@ -167,6 +167,45 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
            </Mappings>
            <Sources />
          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Holydata_TimePMSTableAdapter" GeneratorDataComponentClassName="Holydata_TimePMSTableAdapter" Name="Holydata_TimePMS" UserDataComponentName="Holydata_TimePMSTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_TimePMS(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, 
+               Holyday.DrTimePMS AS Dr, Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
+FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
+               EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
+               Users WITH (NOLOCK) ON Holyday.uid = Users.id
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate = 'PMS') AND 
+               (ISNULL(Holyday.DrTimePMS, 0) + ISNULL(Holyday.CrTime, 0) &lt;&gt; 0)
+ORDER BY Holyday.sdate, Holyday.idx</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" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="sdate" DataSetColumn="sdate" />
+              <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="cate" DataSetColumn="cate" />
+              <Mapping SourceColumn="jun" DataSetColumn="jun" />
+              <Mapping SourceColumn="Dr" DataSetColumn="Dr" />
+              <Mapping SourceColumn="Cr" DataSetColumn="Cr" />
+              <Mapping SourceColumn="contents" DataSetColumn="contents" />
+              <Mapping SourceColumn="name" DataSetColumn="name" />
+              <Mapping SourceColumn="Process" DataSetColumn="Process" />
+              <Mapping SourceColumn="iwol" DataSetColumn="iwol" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
        </Tables>
        <Sources />
      </DataSource>
@@ -344,7 +383,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
              <xs:element name="jan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
              <xs:element name="add" msprop:Generator_ColumnPropNameInTable="addColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="add" msprop:Generator_UserColumnName="add" msprop:Generator_ColumnVarNameInTable="columnadd" type="xs:double" minOccurs="0" />
              <xs:element name="rate" msprop:Generator_ColumnPropNameInTable="rateColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rate" msprop:Generator_UserColumnName="rate" msprop:Generator_ColumnVarNameInTable="columnrate" type="xs:double" minOccurs="0" />
-              <xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
              <xs:element name="drday" msprop:Generator_ColumnPropNameInTable="drdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="drday" msprop:Generator_UserColumnName="drday" msprop:Generator_ColumnVarNameInTable="columndrday" type="xs:double" minOccurs="0" />
              <xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
              <xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
@@ -355,6 +394,60 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
+        <xs:element name="Holydata_TimePMS" msprop:Generator_RowClassName="Holydata_TimePMSRow" msprop:Generator_RowEvHandlerName="Holydata_TimePMSRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimePMSRowDeleted" msprop:Generator_RowDeletingName="Holydata_TimePMSRowDeleting" msprop:Generator_RowEvArgName="Holydata_TimePMSRowChangeEvent" msprop:Generator_TablePropName="Holydata_TimePMS" msprop:Generator_RowChangedName="Holydata_TimePMSRowChanged" msprop:Generator_UserTableName="Holydata_TimePMS" msprop:Generator_RowChangingName="Holydata_TimePMSRowChanging" msprop:Generator_TableClassName="Holydata_TimePMSDataTable" msprop:Generator_TableVarName="tableHolydata_TimePMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_UserColumnName="jun" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_ColumnVarNameInTable="columnjun" type="xs:double" minOccurs="0" />
+              <xs:element name="Dr" msprop:Generator_UserColumnName="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" type="xs:double" minOccurs="0" />
+              <xs:element name="Cr" msprop:Generator_UserColumnName="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" type="xs:double" minOccurs="0" />
+              <xs:element name="contents" msprop:Generator_UserColumnName="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnVarNameInTable="columncontents" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:choice>
    </xs:complexType>
    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -370,5 +463,9 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
      <xs:field xpath="mstns:uid" />
      <xs:field xpath="mstns:cate" />
    </xs:unique>
+    <xs:unique name="Holydata_TimePMS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:Holydata_TimePMS" />
+      <xs:field xpath="mstns:idx" />
+    </xs:unique>
  </xs:element>
 </xs:schema>
--- a/SubProject/FBS0000/dsReport.xss
+++ b/SubProject/FBS0000/dsReport.xss
@@ -6,10 +6,11 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
-    <Shape ID="DesignTable:holydata" ZOrder="1" X="807" Y="56" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
-    <Shape ID="DesignTable:Holydata_Day" ZOrder="4" X="535" Y="46" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
-    <Shape ID="DesignTable:Holydata_Time" ZOrder="3" X="213" Y="50" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:holydatasum" ZOrder="2" X="0" Y="0" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
+    <Shape ID="DesignTable:holydata" ZOrder="3" X="1148" Y="73" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:Holydata_Day" ZOrder="1" X="732" Y="58" Height="474" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
+    <Shape ID="DesignTable:Holydata_Time" ZOrder="5" X="213" Y="50" Height="647" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="579" />
+    <Shape ID="DesignTable:Holydata_TimePMS" ZOrder="2" X="445" Y="98" Height="628" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:holydatasum" ZOrder="4" X="36" Y="35" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
  </Shapes>
  <Connectors />
 </DiagramLayout>