otPMS추가(테스트버젼)
This commit is contained in:
chi
@@ -12,7 +12,7 @@
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" 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 yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPMS, holyotPMS
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
ORDER BY yymm</CommandText>
|
||||
@@ -36,16 +36,27 @@ ORDER BY yymm</CommandText>
|
||||
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="holyot2" DataSetColumn="holyot2" />
|
||||
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
|
||||
<Mapping SourceColumn="holyotPMS" DataSetColumn="holyotPMS" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOt2" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOt2" GeneratorSourceName="FillByOt2" GetMethodModifier="Public" GetMethodName="GetByOt2" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOt2" UserSourceName="FillByOt2">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR
|
||||
ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
|
||||
ORDER BY yymm</CommandText>
|
||||
<CommandText>SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" 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="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="startM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@startM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="endM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@endM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOtPMS" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOtPMS" GeneratorSourceName="FillByOtPMS" GetMethodModifier="Public" GetMethodName="GetByOtPMS" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOtPMS" UserSourceName="FillByOtPMS">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" 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="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -233,7 +244,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
<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
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -269,13 +280,14 @@ ORDER BY pdate</CommandText>
|
||||
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
|
||||
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDate" GeneratorSourceName="FillByDate" GetMethodModifier="Public" GetMethodName="GetByDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDate" UserSourceName="FillByDate">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
FROM vJobReportForUser with(nolock)
|
||||
<CommandText>SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
|
||||
ORDER BY pdate</CommandText>
|
||||
<Parameters>
|
||||
@@ -289,7 +301,7 @@ ORDER BY pdate</CommandText>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByProcess" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByProcess" GeneratorSourceName="FillByProcess" GetMethodModifier="Public" GetMethodName="GetByProcess" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByProcess" UserSourceName="FillByProcess">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
<CommandText>SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -305,7 +317,7 @@ ORDER BY pdate</CommandText>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser_New" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByProcess_New" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByProcess_New" GeneratorSourceName="FillByProcess_New" GetMethodModifier="Public" GetMethodName="GetByProcess_New" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByProcess_New" UserSourceName="FillByProcess_New">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS
|
||||
FROM vJobReportForUser_New WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -321,7 +333,7 @@ ORDER BY pdate</CommandText>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser_New" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillNew" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataNew" GeneratorSourceName="FillNew" GetMethodModifier="Public" GetMethodName="GetDataNew" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataNew" UserSourceName="FillNew">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS
|
||||
FROM vJobReportForUser_New WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -429,7 +441,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
|
||||
<xs:element name="jobReport" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm">
|
||||
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="22" />
|
||||
@@ -437,7 +449,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_UserColumnName="total" msprop:Generator_ColumnVarNameInTable="columntotal" type="xs:int" minOccurs="0" />
|
||||
<xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
|
||||
<xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
@@ -463,6 +475,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
|
||||
<xs:element name="holyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_UserColumnName="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="ot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_UserColumnName="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="holyot2" msprop:Generator_ColumnPropNameInTable="holyot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot2" msprop:Generator_UserColumnName="holyot2" msprop:Generator_ColumnVarNameInTable="columnholyot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="otPMS" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:Generator_ColumnVarNameInTable="columnotPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnPropNameInRow="otPMS" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="holyotPMS" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holyotPMSColumn" msprop:Generator_ColumnVarNameInTable="columnholyotPMS" msprop:Generator_UserColumnName="holyotPMS" msprop:Generator_ColumnPropNameInRow="holyotPMS" type="xs:double" minOccurs="0" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -706,6 +720,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="otPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:Generator_ColumnPropNameInRow="otPMS" msprop:Generator_ColumnVarNameInTable="columnotPMS" type="xs:double" minOccurs="0" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
Reference in New Issue
Block a user