This commit is contained in:
chikyun.kim
2019-08-23 18:08:04 +09:00
parent 63dffe62ef
commit 6a90be2e6d
26 changed files with 933 additions and 436 deletions

View File

@@ -146,16 +146,18 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid,
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid, wdate, dbo.getUserName(wuid) AS userName
FROM LogData
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (ISNULL(serial, '') LIKE @search OR
ISNULL(result, '') LIKE @search OR
ISNULL(remark, '') LIKE @search) OR
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (serial LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (result LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (location LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (reason LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (remark LIKE @search) OR
(gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (dbo.getUserName(wuid) LIKE @search)
ORDER BY pdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.LogData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.LogData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.LogData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="search" ColumnName="serial" DataSourceName="GroupWare.dbo.LogData" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@search" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -220,7 +222,7 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid,
<xs:element name="DSLog" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSLog" msprop:Generator_UserDSName="DSLog">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="LogItem" msprop:Generator_TableClassName="LogItemDataTable" msprop:Generator_TableVarName="tableLogItem" msprop:Generator_TablePropName="LogItem" msprop:Generator_RowDeletingName="LogItemRowDeleting" msprop:Generator_RowChangingName="LogItemRowChanging" msprop:Generator_RowEvHandlerName="LogItemRowChangeEventHandler" msprop:Generator_RowDeletedName="LogItemRowDeleted" msprop:Generator_UserTableName="LogItem" msprop:Generator_RowChangedName="LogItemRowChanged" msprop:Generator_RowEvArgName="LogItemRowChangeEvent" msprop:Generator_RowClassName="LogItemRow">
<xs:element name="LogItem" msprop:Generator_TableClassName="LogItemDataTable" msprop:Generator_TableVarName="tableLogItem" msprop:Generator_RowChangedName="LogItemRowChanged" msprop:Generator_TablePropName="LogItem" msprop:Generator_RowDeletingName="LogItemRowDeleting" msprop:Generator_RowChangingName="LogItemRowChanging" msprop:Generator_RowEvHandlerName="LogItemRowChangeEventHandler" msprop:Generator_RowDeletedName="LogItemRowDeleted" msprop:Generator_RowClassName="LogItemRow" msprop:Generator_UserTableName="LogItem" msprop:Generator_RowEvArgName="LogItemRowChangeEvent">
<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" />
@@ -276,7 +278,7 @@ SELECT idx, gcode, lcode, pdate, serial, location, reason, result, remark, wuid,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="LogData" msprop:Generator_TableClassName="LogDataDataTable" msprop:Generator_TableVarName="tableLogData" msprop:Generator_TablePropName="LogData" msprop:Generator_RowDeletingName="LogDataRowDeleting" msprop:Generator_RowChangingName="LogDataRowChanging" msprop:Generator_RowEvHandlerName="LogDataRowChangeEventHandler" msprop:Generator_RowDeletedName="LogDataRowDeleted" msprop:Generator_UserTableName="LogData" msprop:Generator_RowChangedName="LogDataRowChanged" msprop:Generator_RowEvArgName="LogDataRowChangeEvent" msprop:Generator_RowClassName="LogDataRow">
<xs:element name="LogData" msprop:Generator_TableClassName="LogDataDataTable" msprop:Generator_TableVarName="tableLogData" msprop:Generator_RowChangedName="LogDataRowChanged" msprop:Generator_TablePropName="LogData" msprop:Generator_RowDeletingName="LogDataRowDeleting" msprop:Generator_RowChangingName="LogDataRowChanging" msprop:Generator_RowEvHandlerName="LogDataRowChangeEventHandler" msprop:Generator_RowDeletedName="LogDataRowDeleted" msprop:Generator_RowClassName="LogDataRow" msprop:Generator_UserTableName="LogData" msprop:Generator_RowEvArgName="LogDataRowChangeEvent">
<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" />