diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index fd5a9563..3a989def 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,6 +2,6 @@ "ExpandedNodes": [ "" ], - "SelectedNode": "\\WY.NewJit.sln (src\\Modules\\派格FIS\\WY.NewJit.sln)", + "SelectedNode": "\\SettleAccount.sln (src\\SettleAccount.sln)", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo index c73c4fe0..091b1641 100644 Binary files a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo and b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo differ diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs index b46e903d..85c55cc7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs @@ -11,6 +11,11 @@ using Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs; namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob { + + + /// + /// 1.大众发票与结算汇总核对表-UPdate + /// public class InvoiceSettledDiffDapperRepository : DapperRepository, ITransientDependency { public InvoiceSettledDiffDapperRepository(IDbContextProvider dbContextProvider) @@ -22,50 +27,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob - // string sqlString = - //"SELECT \n" + string.Format(" '{0}' as Version ,", version) + "\n" + - //" b.*,\n" + - //" ISnull(\n" + - //" c.Qty,\n" + - //" IsNull( d.qty, 0 )) SettleQty,\n" + - //"CASE\n" + - //" \n" + - //" WHEN e.Type = 'CP7报废' THEN\n" + - //" isnull( e.Qty, 0 ) ELSE 0 \n" + - //" END AS CP7ScrapQty,\n" + - //"CASE\n" + - //" \n" + - //" WHEN e.Type = '索赔' THEN\n" + - //" isnull( e.Qty, 0 ) ELSE 0 \n" + - //" END AS ClaimQty,\n" + - //" (\n" + - //" b.InvoiceQty - ISnull(\n" + - //" c.Qty,\n" + - //" IsNull( d.qty, 0 ))) DiffQty,\n" + - //" Isnull( f.Price, 0 ) SalePrice,\n" + - //" b.InvoicePrice - Isnull( f.Price, 0 ) DiffPrice,\n" + - //" '' AS SapMaterialCode \n" + - //"FROM\n" + - //" (\n" + - //" SELECT\n" + - //" Factory, MaterialCode,\n" + - //" SUM( QTY ) InvoiceQty,\n" + - //" sum( amt ) InvoiceAmt,\n" + - //" sum( amt )/ sum( Qty ) InvoicePrice \n" + - //" FROM\n" + - //" Set_Invoice \n" + - //" WHERE\n" + - //" version = '{0}' \n" + - //" GROUP BY\n" + - //" MaterialCode,Factory \n" + - //" ) b\n" + - //" LEFT JOIN ( SELECT SUM( QTY ) Qty, MaterialCode FROM Set_settle WHERE version = '{0}' GROUP BY MaterialCode ) c ON b.MaterialCode = c.MaterialCode\n" + - //" LEFT JOIN ( SELECT SUM( QTY ) qty, MaterialCode FROM Set_KanbanSettle WHERE version = '{0}' GROUP BY MaterialCode ) d ON b.MaterialCode = d.MaterialCode\n" + - //" LEFT JOIN ( SELECT * FROM Set_ScrapClaims WHERE version = '{0}' ) e ON b.MaterialCode = e.MaterialCode\n" + - //" LEFT JOIN ( SELECT * FROM Set_PriceList WHERE version = '{0}' ) f ON b.MaterialCode = f.MaterialCode"; - - - string sqlString = "SELECT\n" + " temp1.*, temp1.InvoicePrice - Isnull( temp2.Price, 0 ) DiffPrice , \n" + diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache index c0945f05..a8c100ba 100644 Binary files a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache and b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache differ diff --git a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache index b792a357..421e2dd7 100644 Binary files a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ