From 5ae4d61858042491dc5b7c95f1f24ff87dc96907 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 3 Feb 2022 21:34:12 +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 --- .../Entities/WMS/WMSJitAppService.cs | 4 ++ .../Entities/WMS/WMSKanbanAppService.cs | 8 ++- .../Entities/WMS/WMSKanbanExtendAppService.cs | 8 ++- .../Entities/WMS/WMSSharePart90AppService.cs | 16 +++-- .../Entities/WMS/WMSSharePartAppService.cs | 14 ++++- .../Entities/WMS/TaskList.cs | 60 ++++++++++++++++--- .../Report/ErpPartDapperRepository.cs | 2 +- .../Report/KanbanUnSettledDapperRepository.cs | 2 +- 8 files changed, 92 insertions(+), 22 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs index 2ce0f9a4..546d28dc 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs @@ -128,6 +128,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create() , string.Empty , itm.Qty + ,itm.Price + ,itm.Amt ); _lsCopy.Add(_detail); } @@ -382,6 +384,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts GuidGenerator.Create() ,string.Empty , itm.Qty + ,itm.Price + ,itm.Amt ); _lsCopy.Add(_detail); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs index 8933c639..938bba97 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs @@ -533,7 +533,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, _billNum, 0, - 0 + 0, + itm.InvoicePrice + ,itm.InvoiceAmt ); @@ -686,7 +688,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts itm.BillNum, GuidGenerator.Create() , string.Empty - , itm.Qty + , itm.Qty, + itm.Price, + itm.Amt ); _lsCopy.Add(_detail); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs index 448558ff..9dac590d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs @@ -184,7 +184,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, itm.BillNum, itm.State, - itm.RealityNumber + itm.RealityNumber, + itm.Price, + itm.Amt ); return new PagedResultDto(totalCount, entities); @@ -265,7 +267,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, _billNum, 0, - 0 + 0, + itm.InvoicePrice, + itm.InvoiceAmt ); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs index 981d3533..faf93fa6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs @@ -175,7 +175,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS itm.Remark, itm.Qty, tm1 == null ? 0 : tm1.Qty, - itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty + itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty, + itm.Price, + itm.Amt ); @@ -244,7 +246,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, p.Qty, p.StockQty, - p.Qty + p.Qty, + p.Price, + p.Amt )); _lst.AddRange(_list.ToArray()); } @@ -291,7 +295,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS string.Empty, p.Qty, p.StockQty, - p.Qty + p.Qty, + p.Price, + p.Amt )).ToList(); await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); @@ -469,7 +475,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS , string.Empty , itm.Qty , 0 - , itm.Qty + , itm.Qty, + itm.Price, + itm.Amt ); _lsCopy.Add(_detail); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs index 401548ba..67c2cde0 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -170,7 +170,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts itm.Remark, itm.Qty, tm1 == null ? 0 : tm1.Qty, - itm.OutPutQty + itm.OutPutQty, + itm.Price, + itm.Amt ); @@ -240,7 +242,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, p.Qty, p.StockQty, - p.Qty + p.Qty, + p.Price, + p.Amt )); _lst.AddRange(_list.ToArray()); } @@ -287,7 +291,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts string.Empty, p.Qty, p.StockQty, - p.Qty + p.Qty, + p.Price, + p.Amt )).ToList(); await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 }); int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum); @@ -485,6 +491,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts , itm.Qty , 0 , itm.Qty + ,itm.Price + ,itm.Amt ); _lsCopy.Add(_detail); } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs index e71ec430..9b0c6eed 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS - public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty):base(id) + public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty, decimal price, decimal amt) :base(id) { Id = id; WmsBillNum = wmsBillNum; @@ -117,10 +117,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS TaskId = taskId; Remark = remark; Qty = qty; + Amt = amt; + Price = price; } - + public void SetData(Guid guid,string output,string input,string extend1,string extend2,string version,Guid taskid) { @@ -142,7 +144,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态")] public int State { get; set; } + [ImporterHeader(Name = "开票单价")] + + public decimal Price { set; get; } + [ImporterHeader(Name = "开票金额")] + public decimal Amt { set; get; } + [ImporterHeader(Name = "开票单价",IsIgnore =true)] /// /// 扩展字段1 /// @@ -242,7 +250,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { } - public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty) + public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty, decimal price, decimal amt) { Id = id; WmsBillNum = wmsBillNum; @@ -261,8 +269,13 @@ namespace Win.Sfs.SettleAccount.Entities.WMS TaskId = taskId; Remark = remark; Qty = qty; - + Price = price; + Amt = amt; + } + + + public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId) { Id = id; @@ -270,8 +283,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS WmsBillNum = wmsbillnum; Version = version; TaskId = taskId; - - } // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明 @@ -323,6 +334,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "任务", IsIgnore = true)] public Guid TaskId { set; get; } + [ImporterHeader(Name = "开票单价")] + + public decimal Price { set; get; } + [ImporterHeader(Name = "开票金额")] + public decimal Amt { set; get; } + } @@ -364,7 +381,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS - public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty):base(id) + public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty, decimal price, decimal amt) :base(id) { Type = type; SapMaterialCode = sapMaterialCode; @@ -381,8 +398,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS BillNum = billnum; State = state; RealityNumber = realqty; + Price = price; + Amt = amt; } + + [ImporterHeader(Name = "单据类型")] public string Type { set; get; } [ImporterHeader(Name = "物料号")] @@ -409,6 +430,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string BillNum { set; get; } [ImporterHeader(Name = "状态", IsIgnore = true)] public int State { set; get; } + [ImporterHeader(Name = "开票单价")] + + public decimal Price { set; get; } + [ImporterHeader(Name = "开票金额")] + public decimal Amt { set; get; } } @@ -1389,7 +1415,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { } - public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty) + public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt) { Id = id; WmsBillNum = wmsBillNum; @@ -1410,8 +1436,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Qty = qty; StockQty = stockQty; OutPutQty = outputQty; + Price = price; + Amt = amt; } + public void SetId(Guid id) { @@ -1476,6 +1505,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "出库数量", IsIgnore = true)] public decimal OutPutQty { set; get; } + [ImporterHeader(Name = "开票单价")] + + public decimal Price { set; get; } + [ImporterHeader(Name = "开票金额")] + public decimal Amt { set; get; } } @@ -1652,7 +1686,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS { } - public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty) + public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt) { Id = id; WmsBillNum = wmsBillNum; @@ -1673,8 +1707,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS Qty = qty; StockQty = stockQty; OutPutQty = outputQty; + Price = price; + Amt = amt; } + public void SetId(Guid id) { @@ -1740,6 +1777,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "任务代码", IsIgnore = true)] public Guid TaskId { set; get; } + [ImporterHeader(Name = "开票单价")] + + public decimal Price { set; get; } + [ImporterHeader(Name = "开票金额")] + public decimal Amt { set; get; } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs index 10ecbb45..27c88554 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs @@ -50,7 +50,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report } else { - _materialList = DbConnection.Query("select * from set_material").ToList(); + _materialList = DbConnection.Query("select max(Id) Factory,MaterialCode,MaterialDesc from Set_material group by MaterialCode,MaterialDesc,EstimateTypeDesc,EstimateType ").ToList(); } if (CacheManager.CachePriceList != null) { diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs index 46b06e8e..741e8a54 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs @@ -36,7 +36,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report public decimal InvoiceQty { get; set; } [ExporterHeader(DisplayName ="发货数量")] public decimal Qty { get; set; } - [ExporterHeader(DisplayName = "金额")] + [ExporterHeader(DisplayName = "开票金额")] public decimal InvoiceAmt { get; set; } [ExporterHeader(DisplayName = "开票单价")] public decimal InvoicePrice { get; set; }