..
This commit is contained in:
chi
@@ -871,13 +871,13 @@ ORDER BY pdate DESC, idx DESC</CommandText>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
|
||||
FROM Purchase
|
||||
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND
|
||||
(ISNULL(purchase_admin, '') LIKE @search_admin)
|
||||
UNION
|
||||
SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
|
||||
FROM EETGW_PurchaseCR
|
||||
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND
|
||||
(ISNULL(purchase_admin, '') LIKE @search_admin)
|
||||
@@ -917,19 +917,20 @@ ORDER BY sortkey, wdate DESC</CommandText>
|
||||
<Mapping SourceColumn="sortkey" DataSetColumn="sortkey" />
|
||||
<Mapping SourceColumn="purchase_manager" DataSetColumn="purchase_manager" />
|
||||
<Mapping SourceColumn="purchase_admin" DataSetColumn="purchase_admin" />
|
||||
<Mapping SourceColumn="place" DataSetColumn="place" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTodayIn" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTodayIn" GeneratorSourceName="FillByTodayIn" GetMethodModifier="Public" GetMethodName="GetByTodayIn" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTodayIn" UserSourceName="FillByTodayIn">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
|
||||
FROM Purchase
|
||||
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '')
|
||||
LIKE @search_admin)
|
||||
UNION
|
||||
SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty,
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin
|
||||
dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place
|
||||
FROM EETGW_PurchaseCR
|
||||
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '')
|
||||
LIKE @search_admin)
|
||||
@@ -1509,14 +1510,14 @@ GROUP BY purchase_admin</CommandText>
|
||||
<xs:element name="Ipkolist" msprop:Generator_RowEvHandlerName="IpkolistRowChangeEventHandler" msprop:Generator_RowDeletedName="IpkolistRowDeleted" msprop:Generator_RowDeletingName="IpkolistRowDeleting" msprop:Generator_RowEvArgName="IpkolistRowChangeEvent" msprop:Generator_TablePropName="Ipkolist" msprop:Generator_RowChangedName="IpkolistRowChanged" msprop:Generator_UserTableName="Ipkolist" msprop:Generator_RowChangingName="IpkolistRowChanging" msprop:Generator_RowClassName="IpkolistRow" msprop:Generator_TableClassName="IpkolistDataTable" msprop:Generator_TableVarName="tableIpkolist">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_UserColumnName="source" msprop:Generator_ColumnVarNameInTable="columnsource">
|
||||
<xs:element name="source" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="sourceColumn" msprop:Generator_ColumnPropNameInRow="source" msprop:Generator_UserColumnName="source" msprop:Generator_ColumnVarNameInTable="columnsource" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="2" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
|
||||
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
|
||||
<xs:element name="pdate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
@@ -1617,6 +1618,13 @@ GROUP BY purchase_admin</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="place" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_UserColumnName="place" msprop:Generator_ColumnPropNameInRow="place" 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>
|
||||
@@ -1710,10 +1718,10 @@ GROUP BY purchase_admin</CommandText>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="Purchase_Managerlist" msprop:Generator_RowEvHandlerName="Purchase_ManagerlistRowChangeEventHandler" msprop:Generator_RowDeletedName="Purchase_ManagerlistRowDeleted" msprop:Generator_RowDeletingName="Purchase_ManagerlistRowDeleting" msprop:Generator_RowEvArgName="Purchase_ManagerlistRowChangeEvent" msprop:Generator_TablePropName="Purchase_Managerlist" msprop:Generator_RowChangedName="Purchase_ManagerlistRowChanged" msprop:Generator_RowChangingName="Purchase_ManagerlistRowChanging" msprop:Generator_TableClassName="Purchase_ManagerlistDataTable" msprop:Generator_RowClassName="Purchase_ManagerlistRow" msprop:Generator_TableVarName="tablePurchase_Managerlist" msprop:Generator_UserTableName="Purchase_Managerlist">
|
||||
<xs:element name="Purchase_Managerlist" msprop:Generator_RowClassName="Purchase_ManagerlistRow" msprop:Generator_RowEvHandlerName="Purchase_ManagerlistRowChangeEventHandler" msprop:Generator_RowDeletedName="Purchase_ManagerlistRowDeleted" msprop:Generator_RowDeletingName="Purchase_ManagerlistRowDeleting" msprop:Generator_RowEvArgName="Purchase_ManagerlistRowChangeEvent" msprop:Generator_TablePropName="Purchase_Managerlist" msprop:Generator_RowChangedName="Purchase_ManagerlistRowChanged" msprop:Generator_UserTableName="Purchase_Managerlist" msprop:Generator_RowChangingName="Purchase_ManagerlistRowChanging" msprop:Generator_TableClassName="Purchase_ManagerlistDataTable" msprop:Generator_TableVarName="tablePurchase_Managerlist">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" minOccurs="0">
|
||||
<xs:element name="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
|
||||
Reference in New Issue
Block a user