From 17d113337cc4b9eef1999f38121562dadfd1c0e6 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 16 Nov 2021 13:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo | Bin 0 -> 39936 bytes .../appsettings.Development.json | 4 +- .../appsettings.json | 4 +- .../二次配套套打模板.xlsx | Bin 12897 -> 0 bytes .../当月结算汇总模板.xlsx | Bin 13593 -> 0 bytes .../新建文本文档.txt | 1 - ...配结算供应商明细清单模板.xlsx | Bin 13073 -> 0 bytes ...配结算供应商汇总清单模板.xlsx | Bin 12832 -> 0 bytes .../InvoiceSettledDiffs/InvoiceSettledDiff.cs | 34 +++++- .../InvoiceSettledDiffs/InvoiceSettledDiff.cs | 86 +++++++++----- .../InvoiceSettledDiffDapperRepository.cs | 108 +++++++++++++----- .../PriceQtyDiffDapperReportRepository.cs | 2 +- .../Report/InvoiceSettledDiffExportService.cs | 26 ++++- 13 files changed, 193 insertions(+), 72 deletions(-) create mode 100644 .vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo delete mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/btsecsummary/二次配套套打模板.xlsx delete mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/btsecsummary/当月结算汇总模板.xlsx delete mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/files/host/sec-summary-container/新建文本文档.txt delete mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商明细清单模板.xlsx delete mode 100644 src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商汇总清单模板.xlsx diff --git a/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo b/.vs/Win.Sfs.SmartSettlementSystem.PG/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..c73c4fe0d1176b4a34d937d6a0bb89d1d6ed37e0 GIT binary patch literal 39936 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 literal 0 HcmV?d00001 diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json index 734cc4b1..3e33bbdb 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json @@ -3,8 +3,8 @@ "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" }, "ConnectionStrings": { - "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", - "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008", + "SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;" }, "Logging": { "LogLevel": { diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 03b8ad70..327c3c7a 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -3,8 +3,8 @@ "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" }, "ConnectionStrings": { - "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", - "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008", + "SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;" }, "Logging": { "LogLevel": { diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/btsecsummary/二次配套套打模板.xlsx b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/btsecsummary/二次配套套打模板.xlsx deleted file mode 100644 index 40a3a5cc1f344ca7a97f93fcbeb91b6ac3fd875e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12897 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≧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 diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/files/host/sec-summary-container/新建文本文档.txt b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/files/host/sec-summary-container/新建文本文档.txt deleted file mode 100644 index 96908ec1..00000000 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/files/host/sec-summary-container/新建文本文档.txt +++ /dev/null @@ -1 +0,0 @@ -无条码看板量差 \ No newline at end of file diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商明细清单模板.xlsx b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商明细清单模板.xlsx deleted file mode 100644 index 724205c95c97b28f0fc54a572482b972f2f2cbc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13073 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

+EE0Y8uXgX4OmgUO|jBH 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 Ar~m)} diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商汇总清单模板.xlsx b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/secsummary/大众二配结算供应商汇总清单模板.xlsx deleted file mode 100644 index 5b2d28041177064cadcd1d89cc8ed35e1660f44b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12832 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 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/InvoiceSettledDiffs/InvoiceSettledDiff.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/InvoiceSettledDiffs/InvoiceSettledDiff.cs index 3e6564a2..503f61f2 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/InvoiceSettledDiffs/InvoiceSettledDiff.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/InvoiceSettledDiffs/InvoiceSettledDiff.cs @@ -24,19 +24,41 @@ namespace Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs public class InvoiceSettledDiffExportDto { - [ExporterHeader(DisplayName = "版本")] + + + + // 期间 发运类型 物料组 SAP编码 工厂 零件号 零件号格式整理 零件名称 开票数量 开票 金额 开票单价 结算数量 CP7报废 索赔/退货 数量差异 定价 价格差异 + + [ExporterHeader(DisplayName = "期间")] public string Version { get; set; } + [ExporterHeader(DisplayName = "物料组")] + public string SapMaterialGroup { get; set; } + [ExporterHeader(DisplayName = "SAP编号")] + public string SapMaterialCode { get; set; } + [ExporterHeader(DisplayName = "工厂")] + public string Factory { get; set; } [ExporterHeader(DisplayName ="零件编号")] public string MaterialCode { get; set; } - [ExporterHeader(DisplayName = "发票数量")] + [ExporterHeader(DisplayName = "零件名称")] + public string MaterialDesc { get; set; } + [ExporterHeader(DisplayName = "开票数量")] public decimal InvoiceQty { get; set; } + [ExporterHeader(DisplayName = "金额")] + public decimal InvoiceAmt { get; set; } + [ExporterHeader(DisplayName = "开票单价")] + public decimal InvoicePrice { get; set; } [ExporterHeader(DisplayName ="结算数量")] public decimal SettleQty { get; set; } - - - - [ExporterHeader(DisplayName = "差额量")] + [ExporterHeader(DisplayName = "数量差")] public decimal DiffQty { get; set; } + [ExporterHeader(DisplayName = "CP7报废")] + public decimal CP7ScrapQty { get; set; } + [ExporterHeader(DisplayName = "索赔/退货")] + public decimal ClaimQty { get; set; } + [ExporterHeader(DisplayName = "定价")] + public decimal SalePrice { get; set; } + [ExporterHeader(DisplayName = "价格差异")] + public decimal DiffPrice { get; set; } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs index da3b3865..b43d41d6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/InvoiceSettledDiffs/InvoiceSettledDiff.cs @@ -1,4 +1,5 @@ -using System; +using Magicodes.ExporterAndImporter.Core; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -11,38 +12,69 @@ namespace Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs { public InvoiceSettledDiff() { } - public InvoiceSettledDiff(Guid Id,Guid parentId, string materialCode, decimal invoiceQty, decimal settleQty,string version, decimal diffqty):base(Id) + + public InvoiceSettledDiff(string version, string sapMaterialGroup, string sapMaterialCode, string factory, string materialCode, string materialDesc, decimal invoiceQty, decimal invoiceAmt, decimal invoicePrice, decimal settleQty, decimal diffQty, decimal cP7ScrapQty, decimal claimQty, decimal salePrice, decimal diffPrice) { - ParentId = parentId; + Version = version; + SapMaterialGroup = sapMaterialGroup; + SapMaterialCode = sapMaterialCode; + Factory = factory; MaterialCode = materialCode; + MaterialDesc = materialDesc; InvoiceQty = invoiceQty; + InvoiceAmt = invoiceAmt; + InvoicePrice = invoicePrice; SettleQty = settleQty; - Version = version; - DiffQty = diffqty; + DiffQty = diffQty; + CP7ScrapQty = cP7ScrapQty; + ClaimQty = claimQty; + SalePrice = salePrice; + DiffPrice = diffPrice; + } + + [ExporterHeader(DisplayName = "期间")] + public string Version { get; set; } + [ExporterHeader(DisplayName = "物料组")] + public string SapMaterialGroup { get; set; } + [ExporterHeader(DisplayName = "SAP编号")] + public string SapMaterialCode { get; set; } + [ExporterHeader(DisplayName = "工厂")] + public string Factory { get; set; } + [ExporterHeader(DisplayName = "零件编号")] + public string MaterialCode { get; set; } + [ExporterHeader(DisplayName = "零件名称")] + public string MaterialDesc { get; set; } + [ExporterHeader(DisplayName = "开票数量")] + public decimal InvoiceQty { get; set; } + [ExporterHeader(DisplayName = "金额")] + public decimal InvoiceAmt { get; set; } + [ExporterHeader(DisplayName = "开票单价")] + public decimal InvoicePrice { get; set; } + [ExporterHeader(DisplayName = "结算数量")] + public decimal SettleQty { get; set; } + [ExporterHeader(DisplayName = "数量差")] + public decimal DiffQty { get; set; } + [ExporterHeader(DisplayName = "CP7报废")] + public decimal CP7ScrapQty { get; set; } + [ExporterHeader(DisplayName = "索赔/退货")] + public decimal ClaimQty { get; set; } + [ExporterHeader(DisplayName = "定价")] + public decimal SalePrice { get; set; } + [ExporterHeader(DisplayName = "价格差异")] + public decimal DiffPrice { get; set; } + + + + + + + + + + + - } - - ///

- /// 父ID - /// - public Guid ParentId { set; get; } - /// - /// 物料编码 - /// - public string MaterialCode { set; get; } - /// - /// 发票数量 - /// - public decimal InvoiceQty { set; get; } - /// - /// 结算数量 - /// - public decimal SettleQty { set; get; } - - public string Version { set; get; } - - public decimal DiffQty { set; get; } } } 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 a9ebffd1..4cb3f017 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 @@ -20,39 +20,93 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob public virtual List GetInvoiceSettledDiffReportList(string version,string year, string tablename ,string materialcode) { - string str = string.Empty; - str += " where 1=1 "; - //if (!string.IsNullOrEmpty(year)) + //string str = string.Empty; + //str += " where 1=1 "; + ////if (!string.IsNullOrEmpty(year)) + ////{ + //// str += string.Format(" and year='{0}' ", year); + ////} + //if (!string.IsNullOrEmpty(version)) //{ - // str += string.Format(" and year='{0}' ", year); + // str += string.Format(" and version='{0}' ", version); //} - if (!string.IsNullOrEmpty(version)) - { - str += string.Format(" and version='{0}' ", version); - } + + + //// string sqlString = "select "+ string.Format(" {0} as Version ,",version) + "a.MaterialCode,isnull(b.qty,0) InvoiceQty,isnull(c.qty,0) SettleQty, (isnull(b.qty,0)-isnull(c.qty,0)) as DiffQty from (\n" + + //// " select distinct MaterialCode from( \n"+ + ////"select distinct MaterialCode from Set_Invoice {0}\n" + + //// "union all\n" + + //// "select distinct MaterialCode from {1} {0}\n" + + //// ") temp \n"+ + //// ") as a\n" + + //// "left join\n" + + //// "\n" + + //// "(select SUM(QTY) qty,MaterialCode from Set_Invoice {0} GROUP BY MaterialCode) b on a.MaterialCode=b.MaterialCode\n" + + //// "\n" + + //// "left join\n" + + //// "(select SUM(QTY) qty,MaterialCode from {1} {0} GROUP BY MaterialCode) c on a.MaterialCode=c.MaterialCode"; + + + 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 _sql = string.Format(sqlString, version); + + var _query = DbConnection.Query(_sql); + + + var _list = _query.ToList(); if (!string.IsNullOrEmpty(materialcode)) { - str += string.Format(" and materialcode='{0}' ", materialcode); + _list= _list.Where(p => p.MaterialCode == materialcode).ToList(); } - string sqlString = "select "+ string.Format(" {0} as Version ,",version) + "a.MaterialCode,isnull(b.qty,0) InvoiceQty,isnull(c.qty,0) SettleQty, (isnull(b.qty,0)-isnull(c.qty,0)) as DiffQty from (\n" + - " select distinct MaterialCode from( \n"+ - "select distinct MaterialCode from Set_Invoice {0}\n" + - "union all\n" + - "select distinct MaterialCode from {1} {0}\n" + - ") temp \n"+ - ") as a\n" + - "left join\n" + - "\n" + - "(select SUM(QTY) qty,MaterialCode from Set_Invoice {0} GROUP BY MaterialCode) b on a.MaterialCode=b.MaterialCode\n" + - "\n" + - "left join\n" + - "(select SUM(QTY) qty,MaterialCode from {1} {0} GROUP BY MaterialCode) c on a.MaterialCode=c.MaterialCode"; - - string _sql = string.Format(sqlString, str, tablename); - - var _query = DbConnection.Query(_sql); - return _query.ToList(); + + + return _list; } //public virtual async Task> GetUpFileAsync(string taskid) diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PriceQtyDiffDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PriceQtyDiffDapperReportRepository.cs index 341f7972..cc068b8f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PriceQtyDiffDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PriceQtyDiffDapperReportRepository.cs @@ -46,7 +46,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " FROM(SELECT DISTINCT MaterialCode " + " FROM(SELECT DISTINCT MaterialCode " + " FROM Set_Invoice " + - " WHERE(Version = '{0}') " + + " WHERE(Version = '{0}') " + " UNION ALL " + " SELECT DISTINCT b.SettleMaterialCode AS MaterialCode " + " FROM Set_item_invoice_price AS a INNER JOIN " + diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs index a179b778..76951a32 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs @@ -56,12 +56,26 @@ namespace SettleAccount.Job.Services //_list.Add(new InvoiceSettledDiff(Guid.NewGuid(), _id, itm.MaterialCode, itm.InvoiceQty, itm.SettleQty)); _lsExport.Add(new InvoiceSettledDiffExportDto() { - Version=itm.Version, - MaterialCode = itm.MaterialCode, - InvoiceQty = itm.InvoiceQty, - SettleQty = itm.SettleQty, - DiffQty=itm.DiffQty - }); + + + Version =itm. Version , + MaterialCode =itm. MaterialCode , + InvoiceQty =itm. InvoiceQty , + InvoiceAmt =itm. InvoiceAmt , + InvoicePrice =itm. InvoicePrice , + SettleQty =itm. SettleQty , + CP7ScrapQty =itm. CP7ScrapQty , + ClaimQty =itm. ClaimQty , + DiffQty =itm. DiffQty , + SalePrice =itm. SalePrice , + DiffPrice =itm. DiffPrice , + SapMaterialCode =itm.SapMaterialCode , + Factory = itm.Factory + + + + + }); }