1. 입고화면의 구매담당/승인 필터 추가 및 합계금액 추가
2. 구매목록의 담당/승인자 목록이 공용코드 기반에서 실데이터 기반으로 변경되었습니다.
This commit is contained in:
chi
@@ -871,18 +871,22 @@ 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
|
||||
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
|
||||
FROM Purchase
|
||||
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
|
||||
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
|
||||
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
|
||||
FROM EETGW_PurchaseCR
|
||||
WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
|
||||
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)
|
||||
ORDER BY sortkey, wdate DESC</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="search_manager" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search_manager" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="search_admin" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search_admin" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
@@ -911,24 +915,75 @@ ORDER BY sortkey, wdate DESC</CommandText>
|
||||
<Mapping SourceColumn="po" DataSetColumn="po" />
|
||||
<Mapping SourceColumn="orderno" DataSetColumn="orderno" />
|
||||
<Mapping SourceColumn="sortkey" DataSetColumn="sortkey" />
|
||||
<Mapping SourceColumn="purchase_manager" DataSetColumn="purchase_manager" />
|
||||
<Mapping SourceColumn="purchase_admin" DataSetColumn="purchase_admin" />
|
||||
</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
|
||||
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
|
||||
FROM Purchase
|
||||
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
|
||||
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
|
||||
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
|
||||
FROM EETGW_PurchaseCR
|
||||
WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
|
||||
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)
|
||||
ORDER BY source DESC, request, wdate DESC</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" Scale="0" Size="0" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="0" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="indate" DataSourceName="EE.dbo.Purchase" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="indate" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="search_manager" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search_manager" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="search_admin" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@search_admin" 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="Purchase_ManagerlistTableAdapter" GeneratorDataComponentClassName="Purchase_ManagerlistTableAdapter" Name="Purchase_Managerlist" UserDataComponentName="Purchase_ManagerlistTableAdapter">
|
||||
<MainSource>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByManager" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetByManager" GeneratorSourceName="FillByManager" GetMethodModifier="Public" GetMethodName="GetByManager" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByManager" UserSourceName="FillByManager">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT purchase_manager AS username
|
||||
FROM Purchase WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '')
|
||||
GROUP BY purchase_manager
|
||||
UNION
|
||||
SELECT purchase_manager
|
||||
FROM EETGW_PurchaseCR WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (ISNULL(purchase_manager, '') <> '')
|
||||
GROUP BY purchase_manager</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</MainSource>
|
||||
<Mappings>
|
||||
<Mapping SourceColumn="username" DataSetColumn="username" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByAdmin" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByAdmin" GeneratorSourceName="FillByAdmin" GetMethodModifier="Public" GetMethodName="GetByAdmin" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByAdmin" UserSourceName="FillByAdmin">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT purchase_admin AS username
|
||||
FROM Purchase WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '')
|
||||
GROUP BY purchase_admin
|
||||
UNION
|
||||
SELECT purchase_admin
|
||||
FROM EETGW_PurchaseCR WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (ISNULL(purchase_admin, '') <> '')
|
||||
GROUP BY purchase_admin</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" Scale="0" Size="10" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
@@ -1441,7 +1496,7 @@ ORDER BY source DESC, request, wdate DESC</CommandText>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="currency" msprop:nullValue="USD" msprop:Generator_ColumnPropNameInTable="currencyColumn" msprop:Generator_ColumnVarNameInTable="columncurrency" msprop:Generator_UserColumnName="currency" msprop:Generator_ColumnPropNameInRow="currency" minOccurs="0">
|
||||
<xs:element name="currency" msprop:Generator_ColumnPropNameInTable="currencyColumn" msprop:nullValue="USD" msprop:Generator_ColumnPropNameInRow="currency" msprop:Generator_UserColumnName="currency" msprop:Generator_ColumnVarNameInTable="columncurrency" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="10" />
|
||||
@@ -1548,6 +1603,20 @@ ORDER BY source DESC, request, wdate DESC</CommandText>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="sortkey" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="sortkeyColumn" msprop:Generator_ColumnPropNameInRow="sortkey" msprop:Generator_UserColumnName="sortkey" msprop:Generator_ColumnVarNameInTable="columnsortkey" type="xs:int" minOccurs="0" />
|
||||
<xs:element name="purchase_manager" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="purchase_managerColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="purchase_manager" msprop:Generator_UserColumnName="purchase_manager" msprop:Generator_ColumnVarNameInTable="columnpurchase_manager" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="purchase_admin" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="purchase_adminColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="purchase_admin" msprop:Generator_UserColumnName="purchase_admin" msprop:Generator_ColumnVarNameInTable="columnpurchase_admin" 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>
|
||||
@@ -1641,6 +1710,19 @@ ORDER BY source DESC, request, wdate DESC</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: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:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="50" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:choice>
|
||||
</xs:complexType>
|
||||
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
|
||||
@@ -1660,5 +1742,9 @@ ORDER BY source DESC, request, wdate DESC</CommandText>
|
||||
<xs:selector xpath=".//mstns:PurchaseCheck" />
|
||||
<xs:field xpath="mstns:idx" />
|
||||
</xs:unique>
|
||||
<xs:unique name="Purchase_Managerlist_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
|
||||
<xs:selector xpath=".//mstns:Purchase_Managerlist" />
|
||||
<xs:field xpath="mstns:username" />
|
||||
</xs:unique>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
Reference in New Issue
Block a user