..

2024-01-16 10:09:25 +09:00
parent d76b40ddf0
commit c2be3da94a
40 changed files with 3288 additions and 2627 deletions
--- a/SubProject/FEQ0000/dsPurchase.xsd
+++ b/SubProject/FEQ0000/dsPurchase.xsd
@@ -983,18 +983,27 @@ ORDER BY pdate DESC, idx DESC</CommandText>
              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Purchase" DbObjectType="Table" 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  '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, place
-FROM     Purchase
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND 
-               (ISNULL(purchase_admin, '') LIKE @search_admin)
+                    <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, 
+                      place
+FROM            Purchase
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @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, place
-FROM     EETGW_PurchaseCR
-WHERE  (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @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>
+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, 
+                      place
+FROM            EETGW_PurchaseCR
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @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          'EB' 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, 
+                      place
+FROM            EETGW_PurchaseEB
+WHERE           (state IN ('PO', 'PR', 'Approving')) AND (pdate &gt;= @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" />
@@ -1036,18 +1045,27 @@ ORDER BY sortkey, wdate DESC</CommandText>
              <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, 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)
+                    <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, 
+                      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, 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)
-ORDER BY source DESC, request, wdate DESC</CommandText>
+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, 
+                      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)
+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, 
+                      place
+FROM            EETGW_PurchaseEB
+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="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" />
@@ -2185,14 +2203,14 @@ ORDER BY pdate DESC, idx DESC</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">
@@ -2692,7 +2710,7 @@ ORDER BY pdate DESC, idx DESC</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="site" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="siteColumn" msprop:Generator_ColumnVarNameInTable="columnsite" msprop:Generator_UserColumnName="site" msprop:Generator_ColumnPropNameInRow="site" minOccurs="0">
+              <xs:element name="site" msprop:Generator_ColumnPropNameInTable="siteColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="site" msprop:Generator_UserColumnName="site" msprop:Generator_ColumnVarNameInTable="columnsite" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="10" />