This commit is contained in:
chi
2022-05-30 16:24:06 +09:00
parent 0d46bc87c0
commit 6a5eb13a6c
11 changed files with 611 additions and 495 deletions

View File

@@ -521,7 +521,7 @@ ORDER BY name</CommandText>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="EE.dbo.vGroupUser" 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 gcode, name, id, outdate
<CommandText>SELECT gcode, name, id, outdate, email
FROM vGroupUser
WHERE (ISNULL(useJobReport, 0) = 1) AND (gcode = @gcode)</CommandText>
<Parameters>
@@ -536,6 +536,7 @@ WHERE (ISNULL(useJobReport, 0) = 1) AND (gcode = @gcode)</CommandText>
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="id" DataSetColumn="id" />
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
<Mapping SourceColumn="email" DataSetColumn="email" />
</Mappings>
<Sources />
</TableAdapter>
@@ -944,7 +945,7 @@ ORDER BY pdate</CommandText>
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="MailAuto" msprop:Generator_TableClassName="MailAutoDataTable" msprop:Generator_TableVarName="tableMailAuto" msprop:Generator_RowChangedName="MailAutoRowChanged" msprop:Generator_TablePropName="MailAuto" msprop:Generator_RowDeletingName="MailAutoRowDeleting" msprop:Generator_RowChangingName="MailAutoRowChanging" msprop:Generator_RowEvHandlerName="MailAutoRowChangeEventHandler" msprop:Generator_RowDeletedName="MailAutoRowDeleted" msprop:Generator_RowClassName="MailAutoRow" msprop:Generator_UserTableName="MailAuto" msprop:Generator_RowEvArgName="MailAutoRowChangeEvent">
<xs:element name="MailAuto" msprop:Generator_TableClassName="MailAutoDataTable" msprop:Generator_TableVarName="tableMailAuto" msprop:Generator_TablePropName="MailAuto" msprop:Generator_RowDeletingName="MailAutoRowDeleting" msprop:Generator_RowChangingName="MailAutoRowChanging" msprop:Generator_RowEvHandlerName="MailAutoRowChangeEventHandler" msprop:Generator_RowDeletedName="MailAutoRowDeleted" msprop:Generator_UserTableName="MailAuto" msprop:Generator_RowChangedName="MailAutoRowChanged" msprop:Generator_RowEvArgName="MailAutoRowChangeEvent" msprop:Generator_RowClassName="MailAutoRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1032,7 +1033,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MailData" msprop:Generator_TableClassName="MailDataDataTable" msprop:Generator_TableVarName="tableMailData" msprop:Generator_RowChangedName="MailDataRowChanged" msprop:Generator_TablePropName="MailData" msprop:Generator_RowDeletingName="MailDataRowDeleting" msprop:Generator_RowChangingName="MailDataRowChanging" msprop:Generator_RowEvHandlerName="MailDataRowChangeEventHandler" msprop:Generator_RowDeletedName="MailDataRowDeleted" msprop:Generator_RowClassName="MailDataRow" msprop:Generator_UserTableName="MailData" msprop:Generator_RowEvArgName="MailDataRowChangeEvent">
<xs:element name="MailData" msprop:Generator_TableClassName="MailDataDataTable" msprop:Generator_TableVarName="tableMailData" msprop:Generator_TablePropName="MailData" msprop:Generator_RowDeletingName="MailDataRowDeleting" msprop:Generator_RowChangingName="MailDataRowChanging" msprop:Generator_RowEvHandlerName="MailDataRowChangeEventHandler" msprop:Generator_RowDeletedName="MailDataRowDeleted" msprop:Generator_UserTableName="MailData" msprop:Generator_RowChangedName="MailDataRowChanged" msprop:Generator_RowEvArgName="MailDataRowChangeEvent" msprop:Generator_RowClassName="MailDataRow">
<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" />
@@ -1127,7 +1128,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MailForm" msprop:Generator_TableClassName="MailFormDataTable" msprop:Generator_TableVarName="tableMailForm" msprop:Generator_RowChangedName="MailFormRowChanged" msprop:Generator_TablePropName="MailForm" msprop:Generator_RowDeletingName="MailFormRowDeleting" msprop:Generator_RowChangingName="MailFormRowChanging" msprop:Generator_RowEvHandlerName="MailFormRowChangeEventHandler" msprop:Generator_RowDeletedName="MailFormRowDeleted" msprop:Generator_RowClassName="MailFormRow" msprop:Generator_UserTableName="MailForm" msprop:Generator_RowEvArgName="MailFormRowChangeEvent">
<xs:element name="MailForm" msprop:Generator_TableClassName="MailFormDataTable" msprop:Generator_TableVarName="tableMailForm" msprop:Generator_TablePropName="MailForm" msprop:Generator_RowDeletingName="MailFormRowDeleting" msprop:Generator_RowChangingName="MailFormRowChanging" msprop:Generator_RowEvHandlerName="MailFormRowChangeEventHandler" msprop:Generator_RowDeletedName="MailFormRowDeleted" msprop:Generator_UserTableName="MailForm" msprop:Generator_RowChangedName="MailFormRowChanged" msprop:Generator_RowEvArgName="MailFormRowChangeEvent" msprop:Generator_RowClassName="MailFormRow">
<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" />
@@ -1222,7 +1223,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vMailingProjectSchedule" msprop:Generator_TableClassName="vMailingProjectScheduleDataTable" msprop:Generator_TableVarName="tablevMailingProjectSchedule" msprop:Generator_TablePropName="vMailingProjectSchedule" msprop:Generator_RowDeletingName="vMailingProjectScheduleRowDeleting" msprop:Generator_RowChangingName="vMailingProjectScheduleRowChanging" msprop:Generator_RowEvHandlerName="vMailingProjectScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="vMailingProjectScheduleRowDeleted" msprop:Generator_UserTableName="vMailingProjectSchedule" msprop:Generator_RowChangedName="vMailingProjectScheduleRowChanged" msprop:Generator_RowEvArgName="vMailingProjectScheduleRowChangeEvent" msprop:Generator_RowClassName="vMailingProjectScheduleRow">
<xs:element name="vMailingProjectSchedule" msprop:Generator_TableClassName="vMailingProjectScheduleDataTable" msprop:Generator_TableVarName="tablevMailingProjectSchedule" msprop:Generator_RowChangedName="vMailingProjectScheduleRowChanged" msprop:Generator_TablePropName="vMailingProjectSchedule" msprop:Generator_RowDeletingName="vMailingProjectScheduleRowDeleting" msprop:Generator_RowChangingName="vMailingProjectScheduleRowChanging" msprop:Generator_RowEvHandlerName="vMailingProjectScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="vMailingProjectScheduleRowDeleted" msprop:Generator_RowClassName="vMailingProjectScheduleRow" msprop:Generator_UserTableName="vMailingProjectSchedule" msprop:Generator_RowEvArgName="vMailingProjectScheduleRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1310,7 +1311,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -1330,7 +1331,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vJobReportUserList" msprop:Generator_TableClassName="vJobReportUserListDataTable" msprop:Generator_TableVarName="tablevJobReportUserList" msprop:Generator_RowChangedName="vJobReportUserListRowChanged" msprop:Generator_TablePropName="vJobReportUserList" msprop:Generator_RowDeletingName="vJobReportUserListRowDeleting" msprop:Generator_RowChangingName="vJobReportUserListRowChanging" msprop:Generator_RowEvHandlerName="vJobReportUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportUserListRowDeleted" msprop:Generator_RowClassName="vJobReportUserListRow" msprop:Generator_UserTableName="vJobReportUserList" msprop:Generator_RowEvArgName="vJobReportUserListRowChangeEvent">
<xs:element name="vJobReportUserList" msprop:Generator_TableClassName="vJobReportUserListDataTable" msprop:Generator_TableVarName="tablevJobReportUserList" msprop:Generator_TablePropName="vJobReportUserList" msprop:Generator_RowDeletingName="vJobReportUserListRowDeleting" msprop:Generator_RowChangingName="vJobReportUserListRowChanging" msprop:Generator_RowEvHandlerName="vJobReportUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportUserListRowDeleted" msprop:Generator_UserTableName="vJobReportUserList" msprop:Generator_RowChangedName="vJobReportUserListRowChanged" msprop:Generator_RowEvArgName="vJobReportUserListRowChangeEvent" msprop:Generator_RowClassName="vJobReportUserListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -1361,10 +1362,17 @@ ORDER BY pdate</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="emailColumn" msprop:Generator_UserColumnName="email" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</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" />
@@ -1508,7 +1516,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
<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" />
@@ -1538,7 +1546,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<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: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:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -1680,7 +1688,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDateList" msprop:Generator_TableClassName="JobReportDateListDataTable" msprop:Generator_TableVarName="tableJobReportDateList" msprop:Generator_TablePropName="JobReportDateList" msprop:Generator_RowDeletingName="JobReportDateListRowDeleting" msprop:Generator_RowChangingName="JobReportDateListRowChanging" msprop:Generator_RowEvHandlerName="JobReportDateListRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDateListRowDeleted" msprop:Generator_UserTableName="JobReportDateList" msprop:Generator_RowChangedName="JobReportDateListRowChanged" msprop:Generator_RowEvArgName="JobReportDateListRowChangeEvent" msprop:Generator_RowClassName="JobReportDateListRow">
<xs:element name="JobReportDateList" msprop:Generator_TableClassName="JobReportDateListDataTable" msprop:Generator_TableVarName="tableJobReportDateList" msprop:Generator_RowChangedName="JobReportDateListRowChanged" msprop:Generator_TablePropName="JobReportDateList" msprop:Generator_RowDeletingName="JobReportDateListRowDeleting" msprop:Generator_RowChangingName="JobReportDateListRowChanging" msprop:Generator_RowEvHandlerName="JobReportDateListRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDateListRowDeleted" msprop:Generator_RowClassName="JobReportDateListRow" msprop:Generator_UserTableName="JobReportDateList" msprop:Generator_RowEvArgName="JobReportDateListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">