This commit is contained in:
chi
2021-02-16 08:31:01 +09:00
parent 30b06c2d35
commit 1c52445f76
23 changed files with 985 additions and 378 deletions

View File

@@ -9,16 +9,17 @@
<Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="jobReportTableAdapter" GeneratorDataComponentClassName="jobReportTableAdapter" Name="jobReport" UserDataComponentName="jobReportTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.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">
<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
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
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="GroupWare.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="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>
@@ -31,6 +32,7 @@ ORDER BY yymm</CommandText>
<Mapping SourceColumn="uname" DataSetColumn="uname" />
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
</Mappings>
<Sources />
</TableAdapter>
@@ -39,15 +41,18 @@ ORDER BY yymm</CommandText>
<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 ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
FROM JobReport LEFT OUTER JOIN
<CommandText>SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot,
EETGW_GroupUser.Process AS UserProcess
FROM JobReport INNER JOIN
EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid &lt;&gt; '') AND (JobReport.gcode = @gcode)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid &lt;&gt; '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process
ORDER BY processs, JobReport.pdate, uname</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="yymm" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yymm" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" 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>
@@ -60,6 +65,7 @@ ORDER BY processs, JobReport.pdate, uname</CommandText>
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="processs" DataSetColumn="processs" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
</Mappings>
<Sources />
</TableAdapter>
@@ -177,13 +183,20 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:element>
<xs:element name="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
<xs:element name="UserProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="UserProcess" msprop:Generator_ColumnVarNameInTable="columnUserProcess" msprop:Generator_ColumnPropNameInTable="UserProcessColumn" msprop:Generator_UserColumnName="UserProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -197,7 +210,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
@@ -213,6 +226,13 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="UserProcess" msprop:Generator_ColumnVarNameInTable="columnUserProcess" msprop:Generator_ColumnPropNameInRow="UserProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="UserProcessColumn" msprop:Generator_UserColumnName="UserProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -263,7 +283,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
<xs:element name="option1" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="option1" msprop:Generator_ColumnVarNameInTable="columnoption1" msprop:Generator_ColumnPropNameInTable="option1Column" msprop:Generator_UserColumnName="option1" type="xs:string" minOccurs="0" />
<xs:element name="ItemSupply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemSupply" msprop:Generator_ColumnVarNameInTable="columnItemSupply" msprop:Generator_ColumnPropNameInTable="ItemSupplyColumn" msprop:Generator_UserColumnName="ItemSupply" type="xs:string" minOccurs="0" />
<xs:element name="amt" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amt" msprop:Generator_ColumnVarNameInTable="columnamt" msprop:Generator_ColumnPropNameInTable="amtColumn" msprop:Generator_UserColumnName="amt" type="xs:decimal" minOccurs="0" />
<xs:element name="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" msprop:Generator_ColumnPropNameInRow="amtn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:Generator_UserColumnName="amtn" type="xs:decimal" minOccurs="0" />
<xs:element name="amtn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:Generator_UserColumnName="amtn" type="xs:decimal" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>