...
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
|
||||
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
|
||||
FROM vUserWorkTimeList
|
||||
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
ORDER BY yymm</CommandText>
|
||||
@@ -34,8 +34,27 @@ ORDER BY yymm</CommandText>
|
||||
<Mapping SourceColumn="ot" DataSetColumn="ot" />
|
||||
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
|
||||
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="holyot2" DataSetColumn="holyot2" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
<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 (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
|
||||
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
|
||||
ORDER BY yymm</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<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" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</Sources>
|
||||
</TableAdapter>
|
||||
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportDayTableAdapter" GeneratorDataComponentClassName="JobReportDayTableAdapter" Name="JobReportDay" UserDataComponentName="JobReportDayTableAdapter">
|
||||
<MainSource>
|
||||
@@ -108,12 +127,12 @@ ORDER BY processs</CommandText>
|
||||
</DeleteCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT Users.id, Users.name, JobReport.gcode
|
||||
<CommandText>SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
FROM EETGW_GroupUser INNER JOIN
|
||||
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
|
||||
Users ON JobReport.uid = Users.id
|
||||
WHERE (Users.id <> 'dev') AND (Users.id <> 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode
|
||||
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
|
||||
ORDER BY Users.name</CommandText>
|
||||
<Parameters>
|
||||
<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" />
|
||||
@@ -145,6 +164,8 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
|
||||
<Mapping SourceColumn="id" DataSetColumn="id" />
|
||||
<Mapping SourceColumn="name" DataSetColumn="name" />
|
||||
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
|
||||
<Mapping SourceColumn="indate" DataSetColumn="indate" />
|
||||
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
@@ -230,8 +251,8 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
<MainSource>
|
||||
<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="true">
|
||||
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww
|
||||
<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
|
||||
FROM vJobReportForUser
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
|
||||
ORDER BY pdate</CommandText>
|
||||
@@ -262,6 +283,10 @@ ORDER BY pdate</CommandText>
|
||||
<Mapping SourceColumn="projectName" DataSetColumn="projectName" />
|
||||
<Mapping SourceColumn="description" DataSetColumn="description" />
|
||||
<Mapping SourceColumn="ww" DataSetColumn="ww" />
|
||||
<Mapping SourceColumn="otStart" DataSetColumn="otStart" />
|
||||
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
|
||||
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
|
||||
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
@@ -308,6 +333,8 @@ ORDER BY pdate</CommandText>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="holyot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot2" msprop:Generator_ColumnVarNameInTable="columnholyot2" msprop:Generator_ColumnPropNameInTable="holyot2Column" msprop:Generator_UserColumnName="holyot2" type="xs:double" minOccurs="0" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -384,6 +411,20 @@ ORDER BY pdate</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
@@ -533,6 +574,16 @@ ORDER BY pdate</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
|
||||
<xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
|
||||
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
|
||||
<xs:element name="otReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:Generator_UserColumnName="otReason" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="255" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
Reference in New Issue
Block a user