Browse Source

更新版本

branch_ccpg_220107
Administrator 3 years ago
parent
commit
fd76b6b25a
  1. 2
      .vs/VSWorkspaceState.json
  2. BIN
      .vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo
  3. 49
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs
  4. BIN
      src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
  5. BIN
      src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache

2
.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
}

BIN
.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo

Binary file not shown.

49
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
{
/// <summary>
/// 1.大众发票与结算汇总核对表-UPdate
/// </summary>
public class InvoiceSettledDiffDapperRepository : DapperRepository<SettleAccountDbContext>, ITransientDependency
{
public InvoiceSettledDiffDapperRepository(IDbContextProvider<SettleAccountDbContext> 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" +

BIN
src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache

Binary file not shown.

BIN
src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache

Binary file not shown.
Loading…
Cancel
Save