From 8f7566baaaeeccd724eda4297d707df364012890 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 5 Apr 2022 11:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BC=97=E5=A4=87=E4=BB=B6=E6=9C=AA?= =?UTF-8?q?=E7=BB=93=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/VWSparePart/SparePartAppService.cs | 16 +++++++++++++--- .../Entities/WMS/WMSSharePartAppService.cs | 6 +++--- .../Entities/VWSparePart/SparePart.cs | 11 +++++++++++ .../SettleSparePartDapperReportRepository.cs | 12 ++++++------ 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs index 6a777bfc..aa3dc008 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs @@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart /// - /// 大众备件调整导入（财务期初时用的功能） + /// 大众备件明细数据导入功能（以后正常使用的功能），包含导入有空的订单号 /// /// 上传的文件(前端已经限制只能上传一个附件) /// @@ -101,7 +101,17 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart _bomList.Add(new SparePartVersion(_id, branchId, year, period, version, customerCode)); foreach (var itm in entityList) { - itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90"); + if (string.IsNullOrEmpty(itm.PurchaseOrderNo)) + { + //订单号不空 + itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90", "NoOrder"); + } + else + { + //赋值上主键ID + itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90"); + } + } if (checkList.Count > 0) { @@ -113,7 +123,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart } /// - /// 大众备件明细数据导入功能（以后正常使用的功能） + /// 大众备件调整导入（财务期初时用的功能）,订单号+物料号能一对一匹配 /// /// /// 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 7b988cca..290b8beb 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs @@ -256,9 +256,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts var _list90Summary = _excelHelper.ExcelToListOne();//有单号 - var _list = _listSummary.Where(p =>string.IsNullOrEmpty(p.OrderBillNum)).ToList();//没有采购订单号的集合 - var _listBill = _list90Summary.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum)).ToList();//有采购订单号的集合 - + //NoOrder用来标识采购订单号为空的数据 + var _list = _listSummary.Where(p => p.OrderBillNum== "NoOrder").ToList();//没有采购订单号的集合 + var _listBill = _list90Summary.Where(p => !string.IsNullOrEmpty(p.OrderBillNum) && p.OrderBillNum != "NoOrder").ToList();//有采购订单号的集合 //var _list = _excelHelper.ExcelToList(); diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs index 1a9aa5a2..cae54b14 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs @@ -25,6 +25,17 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart BranchId = branchId; Extend = extend; } + + public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, string extend,string purchaseOrderNo) + { + Period = peroid; + Year = year; + Id = guid; + Version = version; + BranchId = branchId; + Extend = extend; + PurchaseOrderNo = purchaseOrderNo; + } public SparePart(Guid Id, string year, string period, string version, string lineNumber, string purchaseType,string purchaseOrderNo, string purchaseOrderNoItem, string purchaseOrderNoText, decimal receiptQty, decimal invoicedQty, decimal amountNoTax, decimal purchasePriceNoTax, diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs index e0ba4e0a..82d0acd4 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleSparePartDapperReportRepository.cs @@ -596,7 +596,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report " WHERE\n" + " Extend != 'is90' \n" + " AND Version = '{0}' \n" + - " AND PurchaseOrderNo IS NULL \n" + + " AND PurchaseOrderNo='NoOrder' \n" + " GROUP BY\n" + " MaterialCode,\n" + " PurchasePriceNoTax \n" + @@ -758,11 +758,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report string condition = ""; - if (!string.IsNullOrEmpty(begintime)) + if (!string.IsNullOrEmpty(begintime) && Convert.ToDateTime(begintime) != DateTime.MinValue) { condition += string.Format(" and a.SpareDate>='{0}' ", begintime); } - if (!string.IsNullOrEmpty(endtime)) + if (!string.IsNullOrEmpty(endtime) && Convert.ToDateTime(begintime) != DateTime.MinValue) { condition += string.Format(" and a.SpareDate<='{0}' ", endtime); } @@ -1090,11 +1090,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report } - - [ExporterHeader(DisplayName = "交货日期 ")] - public string 交货日期 { set; get; } [ExporterHeader(DisplayName = "交货单号")] public string 交货单号 { set; get; } + [ExporterHeader(DisplayName = "交货日期 ")] + public string 交货日期 { set; get; } + [ExporterHeader(DisplayName = "订单日期")] public string 订单日期 { set; get; }